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
Submitted by:	David Shane Holden <dpejesh@yahoo.com>

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

diff --git a/CHANGES b/CHANGES
index eb7aae4f1caaae2926e0b0a848d988013e01458c..e5dc5ecb95d553dc0cd6fce77774ae19a778a11d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,11 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) 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>] 
+
   *) mod_authz_groupfile: Strip trailing spaces of group names. This
      hopefully saves some hours of searching for typos. PR 12863.
      [André Malo]

diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c
index 93135b8127bd8a4bb312b8309406abc7c3258419..08243e979c7c37969437d1734a484d41147452b2 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^^");
             }