don't let mod_usertrack overwrite other cookies

Andre Malo · Andre Malo · commit f68e17511df0 · 2004-01-29T21:30:49.000Z
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/APACHE_2_0_BRANCH@102450 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.49
 
+  *) mod_usertrack no longer overwrites other cookies.
+     PR 26002.  [Scott Moore <apache nopdesign.com>]
+
   *) worker MPM: fix stack overlay bug that could cause the parent
      process to crash.  [Jeff Trawick]
 
diff --git a/STATUS b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/01/29 21:15:39 $]
+Last modified at [$Date: 2004/01/29 21:30:48 $]
 
 Release:
 
@@ -305,11 +305,6 @@ PATCHES TO BACKPORT FROM 2.1
         modules/experimental/cache_cache.c r1.5
       +1: jwoolley, bnicholes, rederpj
 
-    * Don't let mod_usertrack overwrite other cookies. (2.0 + 1.3)
-      PR 26002.
-        modules/metadata/mod_usertrack.c: r1.44
-      +1: nd, bnicholes, trawick
-
     * 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
diff --git 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 */

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ static void make_cookie(request_rec *r)`
`188`	`188`	`NULL);`
`189`	`189`	`}`
`190`	`190`
`191`		`- apr_table_setn(r->headers_out,`
	`191`	`+ apr_table_addn(r->headers_out,`
`192`	`192`	`(dcfg->style == CT_COOKIE2 ? "Set-Cookie2" : "Set-Cookie"),`
`193`	`193`	`new_cookie);`
`194`	`194`	`apr_table_setn(r->notes, "cookie", apr_pstrdup(r->pool, cookiebuf)); /* log first time */`