don't set the cookie in subrequests. This works around the

Andre Malo · Andre Malo · commit 32ade2e8f303 · 2003-03-07T21:27:38.000Z
problem that cookies were set twice during fast internal redirects. PR: 13211 Reviewed by: Will Rowe, Jeff Trawick git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@98943 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.45
 
+  *) mod_usertrack: don't set the cookie in subrequests. This works
+     around the problem that cookies were set twice during fast internal
+     redirects. PR 13211.  [Andr� Malo]
+
   *) mod_autoindex no longer forgets output format and enabled version
      sort in linked column headers.  [Andr� Malo]
 
diff --git a/STATUS b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/03/07 20:43:47 $]
+Last modified at [$Date: 2003/03/07 21:27:37 $]
 
 Release:
 
@@ -213,12 +213,6 @@ PATCHES TO PORT FROM 2.1
       +1: ianh, wrowe, trawick
        0: nd (err, shouldn't it be DeflateCompressionLevel?)
 
-    * mod_usertrack: don't set the cookie in subrequests. This works
-      around the problem that cookies were set twice during fast internal
-      redirects. PR 13211.
-      modules/metadata/mod_usertrack.c: r1.41
-      +1: nd, wrowe, trawick
-
     * Forward port: Escape special characters (especially control
       characters) in mod_log_config to make a clear distinction between
       client-supplied strings (with special characters) and server-side
diff --git a/modules/metadata/mod_usertrack.c b/modules/metadata/mod_usertrack.c
@@ -200,7 +200,8 @@ static int spot_cookie(request_rec *r)
     const char *cookie;
     const char *value;
 
-    if (!dcfg->enabled) {
+    /* Do not run in subrequests */
+    if (!dcfg->enabled || r->main) {
         return DECLINED;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,8 @@ static int spot_cookie(request_rec *r)`
`200`	`200`	`const char *cookie;`
`201`	`201`	`const char *value;`
`202`	`202`
`203`		`- if (!dcfg->enabled) {`
	`203`	`+ /* Do not run in subrequests */`
	`204`	`+ if (!dcfg->enabled \|\| r->main) {`
`204`	`205`	`return DECLINED;`
`205`	`206`	`}`
`206`	`207`