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

364921 - FIN WAIT sockets

This commit is contained in:
Greg Wilkins 2013-04-15 18:40:05 +10:00
parent 4b546de9c9
commit c912231d74
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java
View File

@ -67,7 +67,7 @@ public class ManyConnectors
new SslConnectionFactory(sslContextFactory,"http/1.1"),
new HttpConnectionFactory(https_config));
https.setPort(8443);
https.setIdleTimeout(5000);
https.setIdleTimeout(500000);
// Set the connectors
server.setConnectors(new Connector[] { http, https });

17
jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
View File

@ -618,18 +618,8 @@ public class SslConnection extends AbstractConnection
}
else
{
if (isOutputShutdown())
{
// We have sent the SSL Close Alert, and we read 0 bytes:
// it's a peer that it is not sending the FIN, so we just
// return -1 as if we did, so the connection will be closed.
return -1;
}
else
{
// we need to wait for more net data
return 0;
}
// we need to wait for more net data
return 0;
}
case FINISHED:
@ -844,8 +834,6 @@ public class SslConnection extends AbstractConnection
{
_bufferPool.release(_encryptedOutput);
_encryptedOutput = null;
if (_sslEngine.isOutboundDone())
getEndPoint().shutdownOutput();
}
}
@ -869,7 +857,6 @@ public class SslConnection extends AbstractConnection
{
_sslEngine.closeOutbound();
flush(BufferUtil.EMPTY_BUFFER); // Send close handshake
getEndPoint().shutdownOutput(); // Send FIN
SslConnection.this.fillInterested(); // seek reply FIN or RST or close handshake
}
catch (Exception e)