]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Merge r593816 from trunk:
authorJim Jagielski <jim@apache.org>
Tue, 20 Nov 2007 14:01:28 +0000 (14:01 +0000)
committerJim Jagielski <jim@apache.org>
Tue, 20 Nov 2007 14:01:28 +0000 (14:01 +0000)
* 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

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

CHANGES
STATUS
modules/generators/mod_autoindex.c

diff --git a/CHANGES b/CHANGES
index c09c827154bb477d7286b76e4b56e4c803ac8c67..e326de046ca2764c26f2679f64b595c3e6facae1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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]
diff --git a/STATUS b/STATUS
index 677d258c5af790c60e83dd34830a560f07e83677..903b2c1330fc7b720c1c87ba5a8f9b5977c2d91a 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -109,13 +109,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      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.
index 8d514021a5ba4b6427cbe4bd0f8eaf7a8f22f285..306208ddebc06bc35c99605e36819035e60afe95 100644 (file)
@@ -160,9 +160,18 @@ static void emit_preamble(request_rec *r, int xhtml, const char *title)
     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);