don't use Cookie2 for reading cookie data

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/1.3.x@102454 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/CHANGES b/src/CHANGES
index a52e00b8d492927d245d89f77a4498141ab44f7d..851ef23ed52ea9f64ff4f9c06e01f7e9264a86d3 100644 (file)
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 1.3.30
 
+  *) 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/src/modules/standard/mod_usertrack.c b/src/modules/standard/mod_usertrack.c
index 4035dfea1d8c444f2d6f3cf2686e01131bb16c79..8fa749c505fb2960dc7d4ef10713b980c61cd0ae 100644 (file)
--- a/src/modules/standard/mod_usertrack.c
+++ b/src/modules/standard/mod_usertrack.c
@@ -320,10 +320,7 @@ static int spot_cookie(request_rec *r)
         return DECLINED;
     }
 
-    if ((cookie_header = ap_table_get(r->headers_in,
-                                      (dcfg->style == CT_COOKIE2
-                                       ? "Cookie2"
-                                       : "Cookie")))) {
+    if ((cookie_header = ap_table_get(r->headers_in, "Cookie"))) {
        if (!ap_regexec(dcfg->regexp, cookie_header, NUM_SUBS, regm, 0)) {
            char *cookieval = NULL;
            /* Our regexp,