Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58809

Correctly recycle the cookies when mapping requests for parallel deployment git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc8.0.x/trunk@1723506 13f79535-47bb-0310-9956-ffa450edef68
apache · Jan 7, 2016 · c39b7ff · c39b7ff
1 parent 0c3ab9d
commit c39b7ff
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -951,8 +951,8 @@ protected boolean postParseRequest(org.apache.coyote.Request req, Request reques
                                 // Recycle cookies and session info in case the
                                 // correct context is configured with different
                                 // settings
-                                req.getCookies().recycle();
                                 request.recycleSessionInfo();
+                                request.recycleCookieInfo(true);
                             }
                             break;
                         }

diff --git a/java/org/apache/catalina/connector/Request.java b/java/org/apache/catalina/connector/Request.java
@@ -477,8 +477,6 @@ public void recycle() {
             parts = null;
         }
         partsParseException = null;
-        cookiesParsed = false;
-        cookiesConverted = false;
         locales.clear();
         localesParsed = false;
         secure = false;
@@ -492,9 +490,9 @@ public void recycle() {
         attributes.clear();
         sslAttributesParsed = false;
         notes.clear();
-        cookies = null;
 
         recycleSessionInfo();
+        recycleCookieInfo(false);
 
         if (Globals.IS_SECURITY_ENABLED || Connector.RECYCLE_FACADES) {
             parameterMap = new ParameterMap<>();
@@ -554,6 +552,16 @@ protected void recycleSessionInfo() {
     }
 
 
+    protected void recycleCookieInfo(boolean recycleCoyote) {
+        cookiesParsed = false;
+        cookiesConverted = false;
+        cookies = null;
+        if (recycleCoyote) {
+            getCoyoteRequest().getCookies().recycle();
+        }
+    }
+
+
     public boolean read() throws IOException {
         return (inputBuffer.realReadBytes(null, 0, 0) > 0);
     }

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
@@ -114,6 +114,10 @@
         Fix declaration of <code>localPort</code> attribute of Connector MBean:
         it is read-only. (kkolinko)
       </fix>
+      <fix>
+        <bug>58809/bug>: Correctly recycle cookies when mapping requests for
+        parallel deployment. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">