From bc5b07c9a43f11fe7b1d5e813574716ab7bd2153 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Malo?= Date: Tue, 15 Jul 2003 13:22:03 +0000 Subject: [PATCH] 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 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100628 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 5 +++++ modules/generators/mod_autoindex.c | 1 + 2 files changed, 6 insertions(+) diff --git a/CHANGES b/CHANGES index eb7aae4f1c..e5dc5ecb95 100644 --- 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 ] + *) 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 93135b8127..08243e979c 100644 --- 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^^"); } -- 2.50.1