Author: remm
Date: Fri Apr 8 15:44:57 2016
New Revision: 1738261
URL: http://svn.apache.org/viewvc?rev=1738261&view=rev
Log:
59289: Running the testsuite, it did look like some upgraded processors can be
placed in the recycled processors, which is probably not what should happen.
Add a test to avoid that.
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1738261&r1=1738260&r2=1738261&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Fri Apr 8
15:44:57 2016
@@ -932,7 +932,9 @@ public abstract class AbstractProtocol<S
Processor processor = connections.remove(socket);
if (processor != null) {
processor.recycle();
- recycledProcessors.push(processor);
+ if (!socketWrapper.isUpgraded()) {
+ recycledProcessors.push(processor);
+ }
}
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1738261&r1=1738260&r2=1738261&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Apr 8 15:44:57 2016
@@ -145,6 +145,10 @@
The default value is <code>-Djdk.tls.ephemeralDHKeySize=2048</code>
which protects against weak Diffie-Hellman keys. (markt)
</add>
+ <fix>
+ <bug>59289</bug>: Do not recycle upgrade processors in unexpected clsoe
+ situations. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="WebSocket">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
