Merge r803704 from trunk:

* Correctly create an empty cell if the description for a file is missing.

PR: 47682
Submitted by: Peter Poeml <poeml suse.de>
Reviewed by: rpluem

Submitted by: rpluem
Reviewed/backported by: jim

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

diff --git a/CHANGES b/CHANGES
index b1a8f75a0f0d2dc2840a194736504ef653ef4948..2a89d2139fff12a015a1296ff5d99d05206e76ea 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.14
 
-
+  *) mod_autoindex: Correctly create an empty cell if the description
+     for a file is missing. PR 47682 [Peter Poeml <poeml suse.de>]
 
 Changes with Apache 2.2.13
 

diff --git a/STATUS b/STATUS
index d22e17fad0b80cf9442b44055cffee8e610e4caa..e10640ff53dabc50e7a6dfbb1a1c54234b14ce3d 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -89,12 +89,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
- * mod_autoindex: Correctly create an empty cell if the description for a
-                  file is missing (PR 47682).
-   Trunk Patch: http://cvs.apache.org/viewvc?view=rev&revision=803704
-   2.2.x Patch: Trunk version of patch works (offset 24 lines)
-   +1: fuankg, poirier, rpluem, jim
-
  * mod_mem_cache: fix seg fault under load due to pool concurrency problem
    PR: 47672
    Trunk Patch: n/a, mod_mem_cache is not in trunk

diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c
index 1c38cf28c9ba529173ee4aa4ae30f8e0068b405e..ef17f66618fa73dd9a3bded38f8d1f882b257fd6 100644 (file)
--- a/modules/generators/mod_autoindex.c
+++ b/modules/generators/mod_autoindex.c
@@ -1762,9 +1762,9 @@ static void output_directories(struct ent **ar, int n,
                                                         desc_width), NULL);
                     }
                 }
-            }
-            else {
-                ap_rputs("</td><td>&nbsp;", r);
+                else {
+                    ap_rputs("</td><td>&nbsp;", r);
+                }
             }
             ap_rputs("</td></tr>\n", r);
         }