Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 3025 invoked from network); 29 Jan 2004 21:42:20 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 29 Jan 2004 21:42:20 -0000 Received: (qmail 88025 invoked by uid 500); 29 Jan 2004 21:42:06 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 87962 invoked by uid 500); 29 Jan 2004 21:42:05 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 87948 invoked by uid 500); 29 Jan 2004 21:42:05 -0000 Delivered-To: apmail-apache-1.3-cvs@apache.org Received: (qmail 87943 invoked from network); 29 Jan 2004 21:42:05 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 29 Jan 2004 21:42:05 -0000 Received: (qmail 2933 invoked by uid 1569); 29 Jan 2004 21:42:16 -0000 Date: 29 Jan 2004 21:42:16 -0000 Message-ID: <20040129214216.2932.qmail@minotaur.apache.org> From: nd@apache.org To: apache-1.3-cvs@apache.org Subject: cvs commit: apache-1.3/src/modules/standard mod_usertrack.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N nd 2004/01/29 13:42:16 Modified: src CHANGES src/modules/standard mod_usertrack.c Log: don't let mod_usertrack overwrite other cookies PR: 26002 Submitted by: Scott Moore Reviewed by: Brad Nicholes, Jeff Trawick Revision Changes Path 1.1926 +4 -1 apache-1.3/src/CHANGES Index: CHANGES =================================================================== RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1925 retrieving revision 1.1926 diff -u -u -r1.1925 -r1.1926 --- CHANGES 28 Jan 2004 21:22:20 -0000 1.1925 +++ CHANGES 29 Jan 2004 21:42:15 -0000 1.1926 @@ -1,5 +1,8 @@ Changes with Apache 1.3.30 + *) mod_usertrack no longer overwrites other cookies. + PR 26002. [Scott Moore ] + *) Add fatal exception hook for running diagnostic code after a crash. [Jeff Trawick] @@ -7,7 +10,7 @@ PR 25772. [Andr� Malo] *) Forensic logging shouldn't log internal redirects. - [Ivan Ristic ] + [Ivan Ristic ] *) Some syntax errors in mod_mime_magic's magic file can result in a 500 error, which previously was unlogged. Now we log the 1.61 +1 -1 apache-1.3/src/modules/standard/mod_usertrack.c Index: mod_usertrack.c =================================================================== RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_usertrack.c,v retrieving revision 1.60 retrieving revision 1.61 diff -u -u -r1.60 -r1.61 --- mod_usertrack.c 13 Jan 2004 13:47:34 -0000 1.60 +++ mod_usertrack.c 29 Jan 2004 21:42:16 -0000 1.61 @@ -279,7 +279,7 @@ 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 */