httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/modules/mappers mod_dir.c
Date Thu, 23 Aug 2001 21:05:42 GMT
wrowe       01/08/23 14:05:42

  Modified:    modules/http http_request.c
               modules/mappers mod_dir.c
  Log:
    Two cases we are certain of canonical correctness
  
  Revision  Changes    Path
  1.107     +1 -0      httpd-2.0/modules/http/http_request.c
  
  Index: http_request.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/http_request.c,v
  retrieving revision 1.106
  retrieving revision 1.107
  diff -u -r1.106 -r1.107
  --- http_request.c	2001/08/07 16:19:02	1.106
  +++ http_request.c	2001/08/23 21:05:41	1.107
  @@ -569,6 +569,7 @@
       r->uri = rr->uri;
       r->args = rr->args;
       r->filename = rr->filename;
  +    r->canonical_filename = rr->canonical_filename;
       r->handler = rr->handler;
       r->content_type = rr->content_type;
       r->content_encoding = rr->content_encoding;
  
  
  
  1.34      +4 -0      httpd-2.0/modules/mappers/mod_dir.c
  
  Index: mod_dir.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_dir.c,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- mod_dir.c	2001/08/06 18:50:53	1.33
  +++ mod_dir.c	2001/08/23 21:05:42	1.34
  @@ -161,7 +161,11 @@
        */
   
       if (r->filename[strlen(r->filename) - 1] != '/') {
  +        if (r->filename != r->canonical_filename)
  +            r->canonical_filename = NULL;
           r->filename = apr_pstrcat(r->pool, r->filename, "/", NULL);
  +        if (r->canonical_filename)
  +            r->canonical_filename = r->filename;
       }
   
       if (d->index_names) {
  
  
  

Mime
View raw message