Fix mod_autoindex output with SuppressRules turned on.

PR: 8016
Submitted by: David Shane Holden <dpejesh@yahoo.com>

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

diff --git a/CHANGES b/CHANGES
index f47cd916884ee437dddb8f377ed69a7f19a048e5..5f9a875e0489d2b6f3b4694eb8dea4fc616e3dac 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,10 @@
 Changes with Apache 2.0.36
 
+  *) mod_autoindex output when SuppressRules was specified would
+     omit the first carriage return so the first item in the list
+     would appear to the right of the column headings instead of
+     underneath them. PR 8016  [David Shane Holden <dpejesh@yahoo.com>]
+
   *) Moved the call to apr_mmap_dup outside the error branch so
      that it would actually get called. This fixes a core dump
      at init everytime you use the MMapFile directive. PR 8314

diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c
index 031045ca4effe9c03131e07dbee704a9df9fd4de..a2f0cd61e76360c4a371d4386946b18541f85cc4 100644 (file)
--- a/modules/generators/mod_autoindex.c
+++ b/modules/generators/mod_autoindex.c
@@ -1607,6 +1607,9 @@ static void output_directories(struct ent **ar, int n,
         if (!(autoindex_opts & SUPPRESS_RULES)) {
             ap_rputs("<hr />", r);
         }
+        else {
+            ap_rputc('\n', r);
+        }
     }
     else {
         ap_rputs("<ul>", r);