From: Jim Jagielski <jim@apache.org>
Date: Wed, 14 Jan 2015 12:56:05 +0000 (+0000)
Subject: Merge r1648201 from trunk:
X-Git-Tag: 2.4.11~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6ba4f9e844f3a24b476e13f8d6f94098d55d5db4;p=apache

Merge r1648201 from trunk:

Add class attributes for empty descriptions
Submitted by: druggeri
Reviewed/backported by: jim


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

diff --git a/STATUS b/STATUS
index e60aa344ae..c52b75217b 100644
--- a/STATUS
+++ b/STATUS
@@ -104,11 +104,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * mod_autoindex: Fix (add) css attribute for description column when column
-                    contains no data. PR 57227. [Bruno Raoult]
-     trunk patch: http://svn.apache.org/r1648201
-     2.4.x patch: https://issues.apache.org/bugzilla/attachment.cgi?id=32209
-     +1: druggeri, gsmith, rjung
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c
index 79f83d73f4..5e86e40728 100644
--- a/modules/generators/mod_autoindex.c
+++ b/modules/generators/mod_autoindex.c
@@ -1782,7 +1782,7 @@ static void output_directories(struct ent **ar, int n,
                     }
                 }
                 else {
-                    ap_rputs("</td><td>&nbsp;", r);
+                    ap_rvputs(r, "</td><td", (d->style_sheet != NULL) ? " class=\"indexcoldesc\">" : ">", "&nbsp;", NULL);
                 }
             }
             ap_rputs("</td></tr>\n", r);