don't overwrite other cookies

PR: 26002
Submitted by: apache nopdesign.com (Scott Moore)

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

diff --git a/CHANGES b/CHANGES
index 3c404c3ce2ee1b5f668501b6f89aba1a573abe19..d0c25136175c3687343ffb0d7eec6bb4418ae280 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 overwrites other cookies.
+     PR 26002.  [Scott Moore <apache nopdesign.com>]
+
   *) Make REMOTE_PORT variable available in mod_rewrite.
      PR 25772.  [André Malo]
 

diff --git a/modules/metadata/mod_usertrack.c b/modules/metadata/mod_usertrack.c
index f69712f616e9737ee7ee686ff079d01b63053a8b..4672639b13a0b3329ad3ea9f32957df0965d864c 100644 (file)
--- a/modules/metadata/mod_usertrack.c
+++ b/modules/metadata/mod_usertrack.c
@@ -188,7 +188,7 @@ static void make_cookie(request_rec *r)
                                  NULL);
     }
 
-    apr_table_setn(r->headers_out,
+    apr_table_addn(r->headers_out,
                    (dcfg->style == CT_COOKIE2 ? "Set-Cookie2" : "Set-Cookie"),
                    new_cookie);
     apr_table_setn(r->notes, "cookie", apr_pstrdup(r->pool, cookiebuf));   /* log first time */