httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r596675 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/generators/mod_autoindex.c
Date Tue, 20 Nov 2007 14:01:31 GMT
Author: jim
Date: Tue Nov 20 06:01:28 2007
New Revision: 596675

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

* Generate valid XHTML output by adding the xhtml namespace.

PR: 43649
Submitted by: Jose Kahan <jose w3.org>
Reviewed by: rpluem

Submitted by: rpluem
Reviewed by: jim

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    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/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=596675&r1=596674&r2=596675&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Tue Nov 20 06:01:28 2007
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.7
 
+  *) mod_autoindex: Generate valid XHTML output by adding the xhtml
+     namespace. PR 43649 [Jose Kahan <jose w3.org>]
+
   *) mod_ldap: Give callers a reference to data copied into the request
      pool instead of references directly into the cache
      PR 43786 [Eric Covener]

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=596675&r1=596674&r2=596675&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Tue Nov 20 06:01:28 2007
@@ -109,13 +109,6 @@
      niq says: done
      jim: +1
 
-    * mod_autoindex: Generate valid XHTML output by adding the xhtml namespace.
-      Trunk version of patch:
-         http://svn.apache.org/viewcvs.cgi?rev=593816&view=rev
-      Backport version for 2.2.x of patch:
-         Trunk version of patch works
-      +1: rpluem, trawick, jim
-
    * core: Avoid some unexpected connection closes by telling the client
      that the connection is not persistent if the MPM process handling
      the request is already exiting when the response header is built.

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=596675&r1=596674&r2=596675&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 Tue Nov 20 06:01:28 2007
@@ -160,9 +160,18 @@
     d = (autoindex_config_rec *) ap_get_module_config(r->per_dir_config,
                                                       &autoindex_module);
 
-    ap_rvputs(r, xhtml ? DOCTYPE_XHTML_1_0T : DOCTYPE_HTML_3_2,
-              "<html>\n <head>\n  <title>Index of ", title,
-              "</title>\n", NULL);
+    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);
+    } else {
+        ap_rvputs(r, DOCTYPE_HTML_3_2,
+		  "<html>\n <head>\n"
+		  "<title>Index of ", title,
+		  "</title>\n", NULL);
+    }
+
     if (d->style_sheet != NULL) {
         ap_rvputs(r, "  <link rel=\"stylesheet\" href=\"", d->style_sheet,
                 "\" type=\"text/css\"", xhtml ? " />\n" : ">\n", NULL);



Mime
View raw message