always use the Cookie header to read a cookie

PR: 11475
Submitted by: Chris Darrochi <chrisd pearsoncmg.com>
Reviewed by: Jeff Trawick, Joe Orton

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

diff --git a/CHANGES b/CHANGES
index fc326b9870163667689488cd2fe7ade0cc054865..aad901e1b4bf90b1b31e90324795229ef81d6d3c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.49
 
+  *) mod_usertrack no longer inspects the Cookie2 header for
+     the cookie name. PR 11475.  [Chris Darrochi <chrisd pearsoncmg.com>]
+
   *) mod_usertrack no longer overwrites other cookies.
      PR 26002.  [Scott Moore <apache nopdesign.com>]
 

diff --git a/STATUS b/STATUS
index e45aacab4000da1d08b57f4afd0967af94da498f..8ab43566163f2e1fb97f0f899edf794bab184090 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/01/29 21:30:48 $]
+Last modified at [$Date: 2004/01/29 21:38:22 $]
 
 Release:
 
@@ -305,11 +305,6 @@ PATCHES TO BACKPORT FROM 2.1
         modules/experimental/cache_cache.c r1.5
       +1: jwoolley, bnicholes, rederpj
 
-    * mod_usertrack: Use always the Cookie header to determine
-      the cookie name (2.0 + 1.3). PR 11475.
-        modules/metadata/mod_usertrack.c: r1.45
-      +1: nd, trawick, jorton
-
     * mod_auth_digest: Allow sub-requests with different methods than the
       original request.  PR 25040.
         modules/aaa/mod_auth_digest.c: r1.82

diff --git a/modules/metadata/mod_usertrack.c b/modules/metadata/mod_usertrack.c
index 4672639b13a0b3329ad3ea9f32957df0965d864c..a967ed060c527c9db1984b0a5f47306d354bc7d0 100644 (file)
--- a/modules/metadata/mod_usertrack.c
+++ b/modules/metadata/mod_usertrack.c
@@ -211,10 +211,7 @@ static int spot_cookie(request_rec *r)
         return DECLINED;
     }
 
-    if ((cookie_header = apr_table_get(r->headers_in,
-                                       (dcfg->style == CT_COOKIE2
-                                        ? "Cookie2"
-                                        : "Cookie")))) {
+    if ((cookie_header = apr_table_get(r->headers_in, "Cookie"))) {
         if (!ap_regexec(dcfg->regexp, cookie_header, NUM_SUBS, regm, 0)) {
             char *cookieval = NULL;
             /* Our regexp,