don't let mod_usertrack overwrite other cookies

PR: 26002
Submitted by: Scott Moore <apache nopdesign.com>
Reviewed by: Brad Nicholes, Jeff Trawick

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

diff --git a/src/CHANGES b/src/CHANGES
index 6c37c81846b343000132ee6e78b2654c0358aa9a..a52e00b8d492927d245d89f77a4498141ab44f7d 100644 (file)
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 1.3.30
 
+  *) mod_usertrack no longer overwrites other cookies.
+     PR 26002.  [Scott Moore <apache nopdesign.com>]
+
   *) Add fatal exception hook for running diagnostic code after a
      crash.  [Jeff Trawick]
 
@@ -7,7 +10,7 @@ Changes with Apache 1.3.30
      PR 25772.  [André Malo]
 
   *) Forensic logging shouldn't log internal redirects.
-     [Ivan Ristic <ivanr@webkreator.com>]
+     [Ivan Ristic <ivanr webkreator.com>]
 
   *) Some syntax errors in mod_mime_magic's magic file can result
      in a 500 error, which previously was unlogged.  Now we log the

diff --git a/src/modules/standard/mod_usertrack.c b/src/modules/standard/mod_usertrack.c
index 92efa0bb0383089241c0eb5b210b1af40b5333c7..4035dfea1d8c444f2d6f3cf2686e01131bb16c79 100644 (file)
--- a/src/modules/standard/mod_usertrack.c
+++ b/src/modules/standard/mod_usertrack.c
@@ -279,7 +279,7 @@ static void make_cookie(request_rec *r)
         new_cookie = ap_pstrcat(r->pool, new_cookie, "; version=1", NULL);
     }
 
-    ap_table_setn(r->headers_out,
+    ap_table_addn(r->headers_out,
                   (dcfg->style == CT_COOKIE2 ? "Set-Cookie2" : "Set-Cookie"),
                   new_cookie);
     ap_table_setn(r->notes, "cookie", ap_pstrdup(r->pool, cookiebuf));   /* log first time */