httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stri...@apache.org
Subject cvs commit: httpd-2.0/modules/generators mod_autoindex.c
Date Sat, 27 Sep 2003 18:34:56 GMT
striker     2003/09/27 11:34:56

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/generators Tag: APACHE_2_0_BRANCH mod_autoindex.c
  Log:
  Backport from 2.1.
  
    *) mod_autoindex: If a directory contains a file listed in the
       DirectoryIndex directive, the folder icon is no longer replaced
       by the icon of that file. PR 9587.
       [David Shane Holden <dpejesh@yahoo.com>]
  
  Reviewed by: Andre Malo, Jeff Trawick, Sander Striker
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.161 +5 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.160
  retrieving revision 1.988.2.161
  diff -u -r1.988.2.160 -r1.988.2.161
  --- CHANGES	27 Sep 2003 18:24:37 -0000	1.988.2.160
  +++ CHANGES	27 Sep 2003 18:34:55 -0000	1.988.2.161
  @@ -1,5 +1,10 @@
   Changes with Apache 2.0.48
   
  +  *) mod_autoindex: If a directory contains a file listed in the
  +     DirectoryIndex directive, the folder icon is no longer replaced
  +     by the icon of that file. PR 9587.
  +     [David Shane Holden <dpejesh@yahoo.com>]
  +
     *) Fixed mod_usertrack to not get false positive matches on the
        user-tracking cookie's name.  PR 16661.
        [Manni Wood <manniwood@planet-save.com>]
  
  
  
  1.751.2.487 +1 -6      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.486
  retrieving revision 1.751.2.487
  diff -u -r1.751.2.486 -r1.751.2.487
  --- STATUS	27 Sep 2003 18:24:38 -0000	1.751.2.486
  +++ STATUS	27 Sep 2003 18:34:56 -0000	1.751.2.487
  @@ -238,11 +238,6 @@
           modules/ssl/ssl_engine_kernel.c: r1.196
         +1: trawick, jorton, striker
   
  -    * use the appropriate folder icon, even if there's a directoryindex
  -      listed file in the particular folder. PR 9587
  -        modules/generators/mod_autoindex.c r1.120
  -      +1: nd, trawick, striker
  -
       * More ab fixes; r1.129 fixes what looks like a trivial error in the 
         SSL support; r1.130 adds some state-handling fixes related to
         ab's breakage in 2.0.47
  
  
  
  No                   revision
  No                   revision
  1.112.2.7 +1 -0      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.6
  retrieving revision 1.112.2.7
  diff -u -r1.112.2.6 -r1.112.2.7
  --- mod_autoindex.c	22 Apr 2003 20:02:43 -0000	1.112.2.6
  +++ mod_autoindex.c	27 Sep 2003 18:34:56 -0000	1.112.2.7
  @@ -1361,6 +1361,7 @@
               if (autoindex_opts & FOLDERS_FIRST) {
                   p->isdir = 1;
               }
  +            rr->filename = ap_make_dirstr_parent (rr->pool, rr->filename);
               if (!(p->icon = find_icon(d, rr, 1))) {
                   p->icon = find_default_icon(d, "^^DIRECTORY^^");
               }
  
  
  

Mime
View raw message