Backport r358769 (cookie2 fix in ajp_header.c - mturk)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@368716 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 7eef9f90b88533413e401e5dc25ddf05b6e126f8..d2ecb4a2020fe1ff0ab359043a4555283bcb6990 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -99,11 +99,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       Message-ID: <4395A056.2070000@web.turner.com>
       +1: jerenkrantz, jim, wrowe
 
-    * mod_proxy: Fix Cookie2 header problems that originates back
-      from mod_jk. Cookie2 was always sent as Cookie.
-      http://svn.apache.org/viewcvs.cgi?rev=358769&view=rev
-      +1: mturk, niq, jim
-
     * mod_ssl: Fix PR37791 (CVEID: CAN-2005-3357) (SEGV if the client is
       connection plain to a SSL enabled port)
       Trunk version of patch:

diff --git a/modules/proxy/ajp_header.c b/modules/proxy/ajp_header.c
index 002b5b3bb83f109051fdb94401b149e91460ac16..6b2d6715077c1bd6c29263c62caab39a4e481690 100644 (file)
--- a/modules/proxy/ajp_header.c
+++ b/modules/proxy/ajp_header.c
@@ -87,7 +87,9 @@ static int sc_for_req_header(const char *header_name)
                 return UNKNOWN_METHOD;
         break;
         case 'C':
-            if (memcmp(p, "OOKIE", 5) == 0)
+            if(memcmp(p, "OOKIE2", 6) == 0)
+                return SC_COOKIE2;
+           else if (memcmp(p, "OOKIE", 5) == 0)
                 return SC_COOKIE;
             else if(memcmp(p, "ONNECTION", 9) == 0)
                 return SC_CONNECTION;
@@ -95,8 +97,6 @@ static int sc_for_req_header(const char *header_name)
                 return SC_CONTENT_TYPE;
             else if(memcmp(p, "ONTENT-LENGTH", 13) == 0)
                 return SC_CONTENT_LENGTH;
-            else if(memcmp(p, "OOKIE2", 6) == 0)
-                return SC_COOKIE2;
             else
                 return UNKNOWN_METHOD;
         break;