according to RFC 2965, inspect only the Cookie header (vs. Cookie2)

PR: 11475
Submitted by: chrisd pearsoncmg.com (Chris Darroch)

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

diff --git a/CHANGES b/CHANGES
index d0c25136175c3687343ffb0d7eec6bb4418ae280..5285a4ad9418b4ab81e9ed1534342c0f40d60627 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) 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/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,