]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
projects / thirdparty / apache / httpd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c782b09)
Merge r599589 from trunk:
authorRuediger Pluem <rpluem@apache.org>
Sun, 9 Dec 2007 14:46:56 +0000 (14:46 +0000)
committerRuediger Pluem <rpluem@apache.org>
Sun, 9 Dec 2007 14:46:56 +0000 (14:46 +0000)
* Detabify and make spacing in HTML code the same as before r593816. This
  avoids that the autoindex test (t/modules/autoindex) fails. Adjusting
  the autoindex test would cause it to fail with older versions and would
  make it harder to recognize regressions.

Submitted by: rpluem
Reviewed by: rpluem, jim, fuankg

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

STATUS patch | blob | blame | history
modules/generators/mod_autoindex.c patch | blob | blame | history

diff --git a/STATUS b/STATUS
index 52b4fcd61b5870d3c26c72986ba8f6f1aadadef9..47fd23fc3a149a441602395eaf362b7a94003d0d 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -89,16 +89,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
        (NWGNUsubstitute need also be copied over from trunk, is missing in your patch)
     +1: jim, rpluem, fuankg
 
-  * mod_autoindex: make spacing in HTML code the same as before r593816. This
-        avoids that the autoindex test (t/modules/autoindex) fails. Adjusting
-        the autoindex test would cause it to fail with older versions and would
-        make it harder to recognize regressions.
-    Trunk version of patch:
-       http://svn.apache.org/viewcvs.cgi?rev=599589&view=rev
-    Backport version for 2.2.x of patch:
-       Trunk version of patch works
-    +1: rpluem, jim, fuankg
-
   * core: Fix broken chunk filtering that causes all non blocking reads to be
           converted into blocking reads
     PR 19954 / 41056
diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c
index 306208ddebc06bc35c99605e36819035e60afe95..3e8153c1535a6403bc835687fcc7435b625f9c0b 100644 (file)
--- a/modules/generators/mod_autoindex.c
+++ b/modules/generators/mod_autoindex.c
@@ -162,14 +162,14 @@ static void emit_preamble(request_rec *r, int xhtml, const char *title)
 
     if (xhtml) {
         ap_rvputs(r, DOCTYPE_XHTML_1_0T,
-                 "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n"
-                 "<head>\n  <title>Index of ", title,
-                 "</title>\n", NULL);
+                  "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n"
+                  " <head>\n  <title>Index of ", title,
+                  "</title>\n", NULL);
     } else {
         ap_rvputs(r, DOCTYPE_HTML_3_2,
-                 "<html>\n <head>\n"
-                 "<title>Index of ", title,
-                 "</title>\n", NULL);
+                  "<html>\n <head>\n"
+                  "  <title>Index of ", title,
+                  "</title>\n", NULL);
     }
 
     if (d->style_sheet != NULL) {
Mirror of https://github.com/apache/httpd.git