rpms/httpd/devel httpd-2.2.0-ajpcookie.patch, NONE, 1.1 httpd.spec, 1.82, 1.83

[fedora-cvs-commits at redhat.com]

Author: jorton

Update of /cvs/dist/rpms/httpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19276

Modified Files:
	httpd.spec 
Added Files:
	httpd-2.2.0-ajpcookie.patch 
Log Message:
* Thu Jan  5 2006 Joe Orton <jorton at redhat.com> 2.2.0-4
- mod_proxy_ajp: fix Cookie handling (Mladen Turk, r358769)


httpd-2.2.0-ajpcookie.patch:
 ajp_header.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE httpd-2.2.0-ajpcookie.patch ---

Author: mturk
Date: Fri Dec 23 00:36:18 2005
New Revision: 358769

URL: http://svn.apache.org/viewcvs?rev=358769&view=rev
Log:
Fix Cookie2 header problems that originates back
from mod_jk. Cookie2 was always sent as Cookie.

--- httpd-2.2.0/modules/proxy/ajp_header.c.ajpcookie
+++ httpd-2.2.0/modules/proxy/ajp_header.c
@@ -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;


Index: httpd.spec
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- httpd.spec	9 Dec 2005 22:40:56 -0000	1.82
+++ httpd.spec	5 Jan 2006 11:49:42 -0000	1.83
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.0
-Release: 3.1
+Release: 4
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -41,6 +41,7 @@
 # Bug fixes
 Patch50: httpd-2.0.45-encode.patch
 Patch51: httpd-2.2.0-headclength.patch
+patch52: httpd-2.2.0-ajpcookie.patch
 License: Apache Software License
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-root
@@ -119,6 +120,7 @@
 # no -b to prevent droplets in install root
 %patch50 -p1
 %patch51 -p1 -b .headclength
+%patch52 -p1 -b .ajpcookie
 
 # Patch in vendor/release string
 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -457,7 +459,7 @@
 %files manual
 %defattr(-,root,root)
 %{contentdir}/manual
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/manual.conf
+%config %{_sysconfdir}/httpd/conf.d/manual.conf
 
 %files -n mod_ssl
 %defattr(-,root,root)
@@ -479,6 +481,9 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Thu Jan  5 2006 Joe Orton <jorton at redhat.com> 2.2.0-4
+- mod_proxy_ajp: fix Cookie handling (Mladen Turk, r358769)
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt