httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/modules/generators mod_autoindex.c
Date Thu, 04 Dec 2003 06:40:14 GMT
trawick     2003/12/03 22:40:14

  Modified:    .        Tag: APACHE_2_0_BRANCH STATUS CHANGES
               modules/generators Tag: APACHE_2_0_BRANCH mod_autoindex.c
  Log:
  merge this from 2.1-dev:
  
     Restore the ability to add a description for directories that
     don't contain an index file.  (Broken in 2.0.48)
  
  Submitted by:	nd
  Reviewed by:	trawick, striker
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.751.2.578 +1 -7      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.577
  retrieving revision 1.751.2.578
  diff -u -r1.751.2.577 -r1.751.2.578
  --- STATUS	4 Dec 2003 06:31:01 -0000	1.751.2.577
  +++ STATUS	4 Dec 2003 06:40:13 -0000	1.751.2.578
  @@ -338,12 +338,6 @@
           include/ap_mmn.h: r1.60
         +1: nd
   
  -    * mod_autoindex: Restore the ability to add a description for
  -      directories that don't contain an index file.
  -      PR 7990
  -        modules/generators/mod_autoindex.c: r1.125
  -      +1: nd, trawick, striker
  -
       * LDAP cache fixes from Matthieu Estrade; see PR 18756
           include/util_ldap.h r1.12
           modules/experimental/util_ldap.c r1.15, r1.16
  
  
  
  1.988.2.190 +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.189
  retrieving revision 1.988.2.190
  diff -u -r1.988.2.189 -r1.988.2.190
  --- CHANGES	4 Dec 2003 06:31:00 -0000	1.988.2.189
  +++ CHANGES	4 Dec 2003 06:40:13 -0000	1.988.2.190
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.49
   
  +  *) Restore the ability to add a description for directories that
  +     don't contain an index file.  (Broken in 2.0.48) [André Malo]
  +
     *) Fix a problem with the display of empty variables ("SetEnv foo") in
        mod_include.  PR 24734  [Markus Julen <mj zermatt.net>]
   
  
  
  
  No                   revision
  No                   revision
  1.112.2.9 +4 -8      httpd-2.0/modules/generators/mod_autoindex.c
  
  Index: mod_autoindex.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_autoindex.c,v
  retrieving revision 1.112.2.8
  retrieving revision 1.112.2.9
  diff -u -r1.112.2.8 -r1.112.2.9
  --- mod_autoindex.c	21 Nov 2003 23:51:54 -0000	1.112.2.8
  +++ mod_autoindex.c	4 Dec 2003 06:40:13 -0000	1.112.2.9
  @@ -1329,14 +1329,6 @@
           return (NULL);
       }
   
  -    if (rr->finfo.filetype == APR_DIR) {
  -        /* ap_sub_req_lookup_dirent() adds '/' to end of any directory,
  -         * but that messes up our attempt to find relevant
  -         * AddDescription directives.
  -         */
  -        rr->filename[strlen(rr->filename) - 1] = '\0';
  -    }
  -
       p = (struct ent *) apr_pcalloc(r->pool, sizeof(struct ent));
       if (dirent->filetype == APR_DIR) {
           p->name = apr_pstrcat(r->pool, dirent->name, "/", NULL);
  @@ -1362,6 +1354,10 @@
                   p->isdir = 1;
               }
               rr->filename = ap_make_dirstr_parent (rr->pool, rr->filename);
  +
  +            /* omit the trailing slash (1.3 compat) */
  +            rr->filename[strlen(rr->filename) - 1] = '\0';
  +
               if (!(p->icon = find_icon(d, rr, 1))) {
                   p->icon = find_default_icon(d, "^^DIRECTORY^^");
               }
  
  
  

Mime
View raw message