364921 - FIN WAIT sockets
This commit is contained in:
parent
4b546de9c9
commit
c912231d74
|
@ -67,7 +67,7 @@ public class ManyConnectors
|
||||||
new SslConnectionFactory(sslContextFactory,"http/1.1"),
|
new SslConnectionFactory(sslContextFactory,"http/1.1"),
|
||||||
new HttpConnectionFactory(https_config));
|
new HttpConnectionFactory(https_config));
|
||||||
https.setPort(8443);
|
https.setPort(8443);
|
||||||
https.setIdleTimeout(5000);
|
https.setIdleTimeout(500000);
|
||||||
|
|
||||||
// Set the connectors
|
// Set the connectors
|
||||||
server.setConnectors(new Connector[] { http, https });
|
server.setConnectors(new Connector[] { http, https });
|
||||||
|
|
|
@ -617,20 +617,10 @@ public class SslConnection extends AbstractConnection
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
else
|
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
|
// we need to wait for more net data
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
case FINISHED:
|
case FINISHED:
|
||||||
throw new IllegalStateException();
|
throw new IllegalStateException();
|
||||||
|
@ -844,8 +834,6 @@ public class SslConnection extends AbstractConnection
|
||||||
{
|
{
|
||||||
_bufferPool.release(_encryptedOutput);
|
_bufferPool.release(_encryptedOutput);
|
||||||
_encryptedOutput = null;
|
_encryptedOutput = null;
|
||||||
if (_sslEngine.isOutboundDone())
|
|
||||||
getEndPoint().shutdownOutput();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -869,7 +857,6 @@ public class SslConnection extends AbstractConnection
|
||||||
{
|
{
|
||||||
_sslEngine.closeOutbound();
|
_sslEngine.closeOutbound();
|
||||||
flush(BufferUtil.EMPTY_BUFFER); // Send close handshake
|
flush(BufferUtil.EMPTY_BUFFER); // Send close handshake
|
||||||
getEndPoint().shutdownOutput(); // Send FIN
|
|
||||||
SslConnection.this.fillInterested(); // seek reply FIN or RST or close handshake
|
SslConnection.this.fillInterested(); // seek reply FIN or RST or close handshake
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
|
|
Loading…
Reference in New Issue