httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: httpd-2.0/modules/mappers mod_rewrite.c
Date Fri, 30 Aug 2002 04:47:57 GMT
jerenkrantz    2002/08/29 21:47:57

  Modified:    modules/mappers mod_rewrite.c
  Log:
  The style police just get really annoyed with this file in general.
  (No code changes)
  
  Revision  Changes    Path
  1.134     +16 -16    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.133
  retrieving revision 1.134
  diff -u -r1.133 -r1.134
  --- mod_rewrite.c	30 Aug 2002 01:06:14 -0000	1.133
  +++ mod_rewrite.c	30 Aug 2002 04:47:57 -0000	1.134
  @@ -4163,34 +4163,34 @@
               
               notename = apr_pstrcat(rmain->pool, var, "_rewrite", NULL);
               apr_pool_userdata_get(&data, notename, rmain->pool);
  -            if  (data == NULL) {
  -               cookie = apr_pstrcat(rmain->pool, 
  -                                    var,
  -                                    "=",
  -                                    val,
  -                                    "; path=",
  -                                    (path)? path : "/",
  -                                    "; domain=",
  -                                    domain,
  -                                    (expires)? "; expires=" : NULL,
  -                                    (expires)? 
  +            if (data == NULL) {
  +                cookie = apr_pstrcat(rmain->pool, 
  +                                     var,
  +                                     "=",
  +                                     val,
  +                                     "; path=",
  +                                     (path)? path : "/",
  +                                     "; domain=",
  +                                     domain,
  +                                     (expires)? "; expires=" : NULL,
  +                                     (expires)? 
                                        ap_ht_time(r->pool, 
                                                   r->request_time + 
                                                   apr_time_from_sec((60 *
                                                                  atol(expires))),
                                                   "%a, %d-%b-%Y %T GMT", 1)
                                              : NULL, 
  -                                  NULL);                   
  +                                   NULL);                   
                   /* 
  -                * XXX: should we add it to err_headers_out as well ?
  -                * if we do we need to be careful that only ONE gets sent out
  -                */
  +                 * XXX: should we add it to err_headers_out as well ?
  +                 * if we do we need to be careful that only ONE gets sent out
  +                 */
                   apr_table_add(rmain->err_headers_out, "Set-Cookie", cookie);
                   apr_pool_userdata_set("set", notename, NULL, rmain->pool);
                   rewritelog(rmain, 5, "setting cookie '%s'", cookie);
               }
               else {
  -                rewritelog(rmain, 5, "cookie '%s' is already set..skipping", var);
  +                rewritelog(rmain, 5, "skipping already set cookie '%s'", var);
               }
           }
       }
  
  
  

Mime
View raw message