Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

336691 fixed SSL close 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2769 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Greg Wilkins 2011-02-10 05:05:49 +00:00
parent 788defff3e
commit 19c5b378c2
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java
View File

@ -149,7 +149,7 @@ public class ChannelEndPoint implements EndPoint
bbuf.position(buffer.putIndex()); bbuf.position(buffer.putIndex());
len=_channel.read(bbuf); len=_channel.read(bbuf);
if (len<0) if (len<0)
close(); _channel.close(); // Don't call this.close() as that may recurse in SSL land and call fill again
} }
finally finally
{ {

2
jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerConnectSSLTest.java
View File

@ -40,6 +40,8 @@ public class ConnectHandlerConnectSSLTest extends AbstractProxyHandlerTest
SslSelectChannelConnector connector = new SslSelectChannelConnector(); SslSelectChannelConnector connector = new SslSelectChannelConnector();
String keyStorePath = System.getProperty("basedir"); String keyStorePath = System.getProperty("basedir");
if (keyStorePath==null)
keyStorePath=".";
keyStorePath += File.separator + "src" + File.separator + "test" + File.separator + "resources" + File.separator + "keystore"; keyStorePath += File.separator + "src" + File.separator + "test" + File.separator + "resources" + File.separator + "keystore";
connector.setKeystore(keyStorePath); connector.setKeystore(keyStorePath);
connector.setPassword("storepwd"); connector.setPassword("storepwd");