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

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

diff --git a/CHANGES b/CHANGES
index 033d962f5712c96cd0270d689555033baa7c919f..ae1ed2fb7ad133b23a14e9ddec4ff3d16f8e387c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) 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]
+
   *) Linux 2.4+: enable coredumps when Apache is started as root
      if CoreDumpDir is configured [Greg Ames]
 

diff --git a/modules/metadata/mod_usertrack.c b/modules/metadata/mod_usertrack.c
index f9c4e1b1ca7532a4942f9460eb940eef4be0359d..ad144ea9e6661da295bfc598b60209776ed700ca 100644 (file)
--- 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;
     }