You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ni...@apache.org on 2006/01/13 14:49:07 UTC
svn commit: r368716 - in /httpd/httpd/branches/2.2.x: STATUS
modules/proxy/ajp_header.c
Author: niq
Date: Fri Jan 13 05:49:03 2006
New Revision: 368716
URL: http://svn.apache.org/viewcvs?rev=368716&view=rev
Log:
Backport r358769 (cookie2 fix in ajp_header.c - mturk)
Modified:
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/STATUS?rev=368716&r1=368715&r2=368716&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Fri Jan 13 05:49:03 2006
@@ -99,11 +99,6 @@
Message-ID: <43...@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:
Modified: httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c?rev=368716&r1=368715&r2=368716&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c Fri Jan 13 05:49:03 2006
@@ -87,7 +87,9 @@
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 @@
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;