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

PR: 21668
Submitted by: Jesse Tie-Ten-Quee <highos highos.com>
Reviewed by: Jeff Trawick, Thom May

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

diff --git a/CHANGES b/CHANGES
index ce055986e72b843c01667e82837322947a45d30c..64ff5ae4c64a8371e54dd4fcbe2f9865ef8f9185 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.49
 
+  *) 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_include no longer allows an ETag header on 304 responses.
      PR 19355. [Geoffrey Young <geoff apache.org>, André Malo]
 

diff --git a/STATUS b/STATUS
index 141b7429a1381ab9682d7b12e2f517f6d87ed2c1..d03e7770bba6b27ae3eb144513edbc5512c1c3fb 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/11/21 23:42:47 $]
+Last modified at [$Date: 2003/11/21 23:51:53 $]
 
 Release:
 
@@ -331,11 +331,6 @@ PATCHES TO BACKPORT FROM 2.1
         server/request.c: r1.130
       +1: nd
 
-    * mod_autoindex: Don't omit the <tr> start tag if the SuppressIcon
-      option is set. PR 21668.
-        modules/generators/mod_autoindex.c: r1.123
-      +1: nd, trawick, thommay
-
     * mod_setenvif: Fix optimizer to treat regexps as such even if they
       only contain anchors like \b. PR 24219.
         modules/metadata/mod_setenvif.c: r1.44

diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c
index ab90d40327f5625b7462bc1f9e93e83ee1f671b7..9aa3967927c854ceb6e0d9c44850d998292146a8 100644 (file)
--- a/modules/generators/mod_autoindex.c
+++ b/modules/generators/mod_autoindex.c
@@ -1650,8 +1650,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);
                 }