Don't omit the initial <tr> if SuppressIcon is set.

Submitted by: Jesse Tie-Ten-Quee <highos@highos.com>
PR: 21668

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

diff --git a/CHANGES b/CHANGES
index c86bceb0eb59a853355b14b679b68ec68ff848bd..a2885abf0c22d4b16b63c646606d7a468e778f76 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) mod_autoindex: Don't omit the <tr> start tag if the SuppressIcon
+     option is set. PR 21668.  [Jesse Tie-Ten-Quee <highos@highos.com>]
+
   *) mod_autoindex / core: Don't fail to show filenames containing
      special characters like '%'. PR 13598.  [André Malo]
 

diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c
index dfe229b2748e219d7421f3b7f787f113e33c0c77..a56e00bfc5834816bf5180cce64dd50fad86f1ff 100644 (file)
--- a/modules/generators/mod_autoindex.c
+++ b/modules/generators/mod_autoindex.c
@@ -1648,8 +1648,9 @@ static void output_directories(struct ent **ar, int n,
         }
 
         if (autoindex_opts & TABLE_INDEXING) {
+            ap_rputs("<tr>", r);
             if (!(autoindex_opts & SUPPRESS_ICON)) {
-                ap_rputs("<tr><td valign=\"top\">", r);
+                ap_rputs("<td valign=\"top\">", r);
                 if (autoindex_opts & ICONS_ARE_LINKS) {
                     ap_rvputs(r, "<a href=\"", anchor, "\">", NULL);
                 }