You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ia...@apache.org on 2002/08/30 01:14:52 UTC

cvs commit: httpd-2.0/docs/manual/mod mod_rewrite.xml

ianh        2002/08/29 16:14:52

  Modified:    .        CHANGES
               modules/mappers mod_rewrite.c
               docs/manual/mod mod_rewrite.xml
  Log:
  new option 'path' to the cookie
  PR: 12172
  
  Submitted by: apachecvslog@robcromwell.com (Rob Cromwell)
  
  Revision  Changes    Path
  1.906     +3 -2      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.905
  retrieving revision 1.906
  diff -u -r1.905 -r1.906
  --- CHANGES	29 Aug 2002 22:45:12 -0000	1.905
  +++ CHANGES	29 Aug 2002 23:14:51 -0000	1.906
  @@ -1,7 +1,8 @@
   Changes with Apache 2.0.41
   
  -  *) mod_rewrite can now sets cookies in err_headers, and uses the correct
  -     expiry date. PR 12132 
  +  *) mod_rewrite can now sets cookies in err_headers, uses the correct
  +     expiry date, and can now set the path as well
  +     PR 12132,12181,12172.
        [Ian Holsman / Rob Cromwell <ap...@robcromwell.com>]
   
     *) The content-length filter no longer tries to buffer up
  
  
  
  1.132     +10 -1     httpd-2.0/modules/mappers/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_rewrite.c,v
  retrieving revision 1.131
  retrieving revision 1.132
  diff -u -r1.131 -r1.132
  --- mod_rewrite.c	29 Aug 2002 22:58:52 -0000	1.131
  +++ mod_rewrite.c	29 Aug 2002 23:14:52 -0000	1.132
  @@ -4134,6 +4134,7 @@
       char *val;
       char *domain;
       char *expires;
  +    char *path;
   
       char *tok_cntx;
       char *cookie;
  @@ -4144,6 +4145,12 @@
           domain = apr_strtok(NULL, ":", &tok_cntx);
           /** the line below won't hit the token ever **/
           expires = apr_strtok(NULL, ":", &tok_cntx); 
  +        if (expires) {
  +            path = apr_strtok(NULL,":", &tok_cntx);
  +        }
  +        else {
  +            path = NULL;
  +        }
   
           if (var && val && domain) {
               /* FIX: use cached time similar to how logging does it */
  @@ -4161,7 +4168,9 @@
                                       var,
                                       "=",
                                       val,
  -                                    "; path=/; domain=",
  +                                    "; path=",
  +                                    (path)? path : "/",
  +                                    "; domain=",
                                       domain,
                                       (expires)? "; expires=" : NULL,
                                       (expires)? 
  
  
  
  1.8       +4 -3      httpd-2.0/docs/manual/mod/mod_rewrite.xml
  
  Index: mod_rewrite.xml
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_rewrite.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- mod_rewrite.xml	25 Aug 2002 03:53:41 -0000	1.7
  +++ mod_rewrite.xml	29 Aug 2002 23:14:52 -0000	1.8
  @@ -1611,13 +1611,14 @@
           information from URLs.</li>
   
           <li>
  -        '<strong><code>cookie|CO=</code></strong><em>NAME</em>:<em>VAL</em>:<em>domain</em>[:<em>lifetime</em>]'
  +		'<strong><code>cookie|CO=</code></strong><em>NAME</em>:<em>VAL</em>:<em>domain</em>[:<em>lifetime</em>[:<em>path</em>]]'
           (set <strong>co</strong>cookie)<br />
           This sets a cookie on the client's browser.  The cookie's name
           is specified by <em>NAME</em> and the value is
           <em>VAL</em>. The <em>domain</em> field is the domain of the
  -        cookie, such as '.apache.org' and the optional <em>lifetime</em>
  -        is the lifetime of the cookie in minutes.</li>
  +        cookie, such as '.apache.org',the optional <em>lifetime</em>
  +	is the lifetime of the cookie in minutes, and the optional 
  +	<em>path</em> is the path of the cookie</li>
    
         </ul>