You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rp...@apache.org on 2007/12/09 15:46:57 UTC

svn commit: r602678 - in /httpd/httpd/branches/2.2.x: STATUS modules/generators/mod_autoindex.c

Author: rpluem
Date: Sun Dec  9 06:46:56 2007
New Revision: 602678

URL: http://svn.apache.org/viewvc?rev=602678&view=rev
Log:
Merge r599589 from trunk:

* 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

Modified:
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/generators/mod_autoindex.c

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=602678&r1=602677&r2=602678&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Sun Dec  9 06:46:56 2007
@@ -89,16 +89,6 @@
        (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

Modified: httpd/httpd/branches/2.2.x/modules/generators/mod_autoindex.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/generators/mod_autoindex.c?rev=602678&r1=602677&r2=602678&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/generators/mod_autoindex.c (original)
+++ httpd/httpd/branches/2.2.x/modules/generators/mod_autoindex.c Sun Dec  9 06:46:56 2007
@@ -162,14 +162,14 @@
 
     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) {