Author: remm
Date: Mon Apr 11 16:11:54 2016
New Revision: 1738596
URL: http://svn.apache.org/viewvc?rev=1738596&view=rev
Log:
59289: Avoid placing an updgraded processor in the recycle list
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1738596&r1=1738595&r2=1738596&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
Mon Apr 11 16:11:54 2016
@@ -152,7 +152,9 @@ public class Http11Nio2Protocol extends
connections.remove(socket.getSocket());
if (processor != null) {
processor.recycle(true);
- recycledProcessors.push(processor);
+ if (!processor.isUpgrade()) {
+ recycledProcessors.push(processor);
+ }
}
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1738596&r1=1738595&r2=1738596&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
Mon Apr 11 16:11:54 2016
@@ -197,7 +197,9 @@ public class Http11NioProtocol extends A
connections.remove(socket.getSocket());
if (processor != null) {
processor.recycle(true);
- recycledProcessors.push(processor);
+ if (!processor.isUpgrade()) {
+ recycledProcessors.push(processor);
+ }
}
}
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1738596&r1=1738595&r2=1738596&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Mon Apr 11 16:11:54 2016
@@ -127,6 +127,10 @@
Exclude ciphers that use RSA keys from the default cipher list since
they do not support forward secrecy. (markt)
</update>
+ <fix>
+ <bug>59289</bug>: Do not recycle upgrade processors in unexpected close
+ situations. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
