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/server request.c
Date Thu, 30 Aug 2001 23:58:23 GMT
wrowe       01/08/30 16:58:23

  Modified:    server   request.c
  Log:
    The add-in/strip-off temporary trailing slash logic was really hosed
    in the new (not yet enabled) code path.  Now it's slightly hosed.
  
  Revision  Changes    Path
  1.38      +4 -4      httpd-2.0/server/request.c
  
  Index: request.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/request.c,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- request.c	2001/08/30 20:48:06	1.37
  +++ request.c	2001/08/30 23:58:23	1.38
  @@ -666,7 +666,7 @@
       ap_conf_vector_t **sec_ent = (ap_conf_vector_t **) sconf->sec_dir->elts;
       int num_sec = sconf->sec_dir->nelts;
       int sec_idx;
  -    unsigned int seg;
  +    unsigned int seg, startseg;
       int res;
       ap_conf_vector_t *entry_config;
       core_dir_config *entry_core;
  @@ -728,7 +728,7 @@
        * sec_idx keeps track of which section we're on, since sections are
        *     ordered by number of segments. See core_reorder_directories 
        */
  -    seg = ap_count_dirs(r->filename);
  +    startseg = seg = ap_count_dirs(r->filename);
       sec_idx = 0;
       do {
           int overrides_here;
  @@ -737,7 +737,7 @@
           
           /* We have no trailing slash, but we sure would appreciate one...
            */
  -        if (!sec_idx && r->filename[strlen(r->filename)-1] != '/')
  +        if (sec_idx && r->filename[strlen(r->filename)-1] != '/')
               strcat(r->filename, "/");
   
           /* Begin *this* level by looking for matching <Directory> sections
  @@ -796,7 +796,7 @@
   
           /* That temporary trailing slash was useful, now drop it.
            */
  -        if (seg > 1)
  +        if (seg > startseg)
               r->filename[strlen(r->filename) - 1] = '\0';
   
           /* Time for all good things to come to an end?
  
  
  

Mime
View raw message