cvs commit: httpd-2.0/modules/metadata mod_usertrack.c

[nd...@apache.org]

nd          2003/03/06 15:12:29

  Modified:    .        CHANGES
               modules/metadata mod_usertrack.c
  Log:
  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
  
  Revision  Changes    Path
  1.1108    +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1107
  retrieving revision 1.1108
  diff -u -r1.1107 -r1.1108
  --- CHANGES	6 Mar 2003 21:48:57 -0000	1.1107
  +++ CHANGES	6 Mar 2003 23:12:28 -0000	1.1108
  @@ -2,6 +2,10 @@
   
     [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]
   
  
  
  
  1.41      +2 -1      httpd-2.0/modules/metadata/mod_usertrack.c
  
  Index: mod_usertrack.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_usertrack.c,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- mod_usertrack.c	3 Feb 2003 17:53:10 -0000	1.40
  +++ mod_usertrack.c	6 Mar 2003 23:12:29 -0000	1.41
  @@ -200,7 +200,8 @@
       const char *cookie;
       const char *value;
   
  -    if (!dcfg->enabled) {
  +    /* Do not run in subrequests */
  +    if (!dcfg->enabled || r->main) {
           return DECLINED;
       }