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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@101330 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 1fe7900c6db4515f3f699521019b7f34ece3d465..d8b7cca0720313f65608a52e8a83c6703bef01be 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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>]

diff --git a/STATUS b/STATUS
index 457311785f89989bbf8df025cda53ec0e957c2b7..08ce875cb84b885e559a7e3b0d743ab47c029c90 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/09/27 18:24:38 $]
+Last modified at [$Date: 2003/09/27 18:34:56 $]
 
 Release:
 
@@ -238,11 +238,6 @@ PATCHES TO PORT FROM 2.1
         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

diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c
index 8717f12554efef7828563b741df16c81b8c91535..ab90d40327f5625b7462bc1f9e93e83ee1f671b7 100644 (file)
--- a/modules/generators/mod_autoindex.c
+++ b/modules/generators/mod_autoindex.c
@@ -1361,6 +1361,7 @@ static struct ent *make_autoindex_entry(const apr_finfo_t *dirent,
             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^^");
             }