You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2020/01/31 02:38:05 UTC
svn commit: r1873397 - in /httpd/httpd/trunk: ./ docs/docroot/ include/
modules/dav/main/ modules/examples/ modules/generators/ modules/http/
modules/ldap/ modules/mappers/ modules/proxy/
Author: covener
Date: Fri Jan 31 02:38:05 2020
New Revision: 1873397
URL: http://svn.apache.org/viewvc?rev=1873397&view=rev
Log:
PR62989: DOCTYPE tags in server-generated HTML.
Submitted By: Andra Farkas <deepbluemistake gmail.com>, Giovanni Bechis <giovanni paclan.it>
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/docs/docroot/index.html
httpd/httpd/trunk/include/httpd.h
httpd/httpd/trunk/modules/dav/main/mod_dav.h
httpd/httpd/trunk/modules/examples/mod_example_hooks.c
httpd/httpd/trunk/modules/generators/mod_autoindex.c
httpd/httpd/trunk/modules/generators/mod_status.c
httpd/httpd/trunk/modules/http/http_protocol.c
httpd/httpd/trunk/modules/ldap/util_ldap.c
httpd/httpd/trunk/modules/mappers/mod_imagemap.c
httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1873397&r1=1873396&r2=1873397&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Fri Jan 31 02:38:05 2020
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache 2.5.1
+ *) Update DOCTYPE tags in server-generated HTML. PR62989.
+ [Andra Farkas <deepbluemistake gmail.com>, Giovanni Bechis <giovanni paclan.it>]
+
*) mod_setenvif: Passing an env-variable parameter of "--early" in non-perdir
context runs directives from this module before `RequestHeader ... early`
are evaluated. This allows results of SetEnvIf conditionals to be used
Modified: httpd/httpd/trunk/docs/docroot/index.html
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/docroot/index.html?rev=1873397&r1=1873396&r2=1873397&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/docroot/index.html (original)
+++ httpd/httpd/trunk/docs/docroot/index.html Fri Jan 31 02:38:05 2020
@@ -1 +1,9 @@
-<html><body><h1>It works!</h1></body></html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>It works! Apache httpd</title>
+</head>
+<body>
+<p>It works!</p>
+</body>
+</html>
Modified: httpd/httpd/trunk/include/httpd.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/httpd.h?rev=1873397&r1=1873396&r2=1873397&view=diff
==============================================================================
--- httpd/httpd/trunk/include/httpd.h (original)
+++ httpd/httpd/trunk/include/httpd.h Fri Jan 31 02:38:05 2020
@@ -249,6 +249,10 @@ extern "C" {
#define DOCTYPE_HTML_4_0F "<!DOCTYPE HTML PUBLIC \"-//W3C//" \
"DTD HTML 4.0 Frameset//EN\"\n" \
"\"http://www.w3.org/TR/REC-html40/frameset.dtd\">\n"
+/** HTML 4.01 Doctype */
+#define DOCTYPE_HTML_4_01 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">\n"
+/** HTML 5 Doctype */
+#define DOCTYPE_HTML_5 "<!DOCTYPE html>\n"
/** XHTML 1.0 Strict Doctype */
#define DOCTYPE_XHTML_1_0S "<!DOCTYPE html PUBLIC \"-//W3C//" \
"DTD XHTML 1.0 Strict//EN\"\n" \
Modified: httpd/httpd/trunk/modules/dav/main/mod_dav.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/dav/main/mod_dav.h?rev=1873397&r1=1873396&r2=1873397&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/dav/main/mod_dav.h (original)
+++ httpd/httpd/trunk/modules/dav/main/mod_dav.h Fri Jan 31 02:38:05 2020
@@ -50,7 +50,7 @@ extern "C" {
#define DAV_READ_BLOCKSIZE 2048 /* used for reading input blocks */
-#define DAV_RESPONSE_BODY_1 "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\n<html><head>\n<title>"
+#define DAV_RESPONSE_BODY_1 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">\n<html>\n<head>\n<title>"
#define DAV_RESPONSE_BODY_2 "</title>\n</head><body>\n<h1>"
#define DAV_RESPONSE_BODY_3 "</h1>\n<p>"
#define DAV_RESPONSE_BODY_4 "</p>\n"
Modified: httpd/httpd/trunk/modules/examples/mod_example_hooks.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/examples/mod_example_hooks.c?rev=1873397&r1=1873396&r2=1873397&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/examples/mod_example_hooks.c (original)
+++ httpd/httpd/trunk/modules/examples/mod_example_hooks.c Fri Jan 31 02:38:05 2020
@@ -1007,7 +1007,7 @@ static int x_handler(request_rec *r)
* Now send our actual output. Since we tagged this as being
* "text/html", we need to embed any HTML.
*/
- ap_rputs(DOCTYPE_HTML_3_2, r);
+ ap_rputs(DOCTYPE_HTML_4_01, r);
ap_rputs("<HTML>\n", r);
ap_rputs(" <HEAD>\n", r);
ap_rputs(" <TITLE>mod_example_hooks Module Content-Handler Output\n", r);
Modified: httpd/httpd/trunk/modules/generators/mod_autoindex.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/mod_autoindex.c?rev=1873397&r1=1873396&r2=1873397&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/mod_autoindex.c (original)
+++ httpd/httpd/trunk/modules/generators/mod_autoindex.c Fri Jan 31 02:38:05 2020
@@ -179,7 +179,7 @@ static void emit_preamble(request_rec *r
" <head>\n <title>Index of ", title,
"</title>\n", NULL);
} else {
- ap_rvputs(r, DOCTYPE_HTML_3_2,
+ ap_rvputs(r, DOCTYPE_HTML_4_01,
"<html>\n <head>\n"
" <title>Index of ", title,
"</title>\n", NULL);
Modified: httpd/httpd/trunk/modules/generators/mod_status.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/mod_status.c?rev=1873397&r1=1873396&r2=1873397&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/mod_status.c (original)
+++ httpd/httpd/trunk/modules/generators/mod_status.c Fri Jan 31 02:38:05 2020
@@ -412,7 +412,7 @@ static int status_handler(request_rec *r
ap_get_loadavg(&t);
if (!short_report) {
- ap_rputs(DOCTYPE_HTML_3_2
+ ap_rputs(DOCTYPE_HTML_4_01
"<html><head>\n"
"<title>Apache Status</title>\n"
"</head><body>\n"
Modified: httpd/httpd/trunk/modules/http/http_protocol.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/http_protocol.c?rev=1873397&r1=1873396&r2=1873397&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/http_protocol.c (original)
+++ httpd/httpd/trunk/modules/http/http_protocol.c Fri Jan 31 02:38:05 2020
@@ -1331,7 +1331,7 @@ AP_DECLARE(void) ap_send_error_response(
*/
ap_rvputs_proto_in_ascii(r,
- DOCTYPE_HTML_2_0
+ DOCTYPE_HTML_4_01
"<html><head>\n<title>", title,
"</title>\n</head><body>\n<h1>", h1, "</h1>\n",
NULL);
Modified: httpd/httpd/trunk/modules/ldap/util_ldap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ldap/util_ldap.c?rev=1873397&r1=1873396&r2=1873397&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ldap/util_ldap.c (original)
+++ httpd/httpd/trunk/modules/ldap/util_ldap.c Fri Jan 31 02:38:05 2020
@@ -173,7 +173,7 @@ static int util_ldap_handler(request_rec
if (r->header_only)
return OK;
- ap_rputs(DOCTYPE_HTML_3_2
+ ap_rputs(DOCTYPE_HTML_4_01
"<html><head><title>LDAP Cache Information</title></head>\n", r);
ap_rputs("<body bgcolor='#ffffff'><h1 align=center>LDAP Cache Information"
"</h1>\n", r);
Modified: httpd/httpd/trunk/modules/mappers/mod_imagemap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_imagemap.c?rev=1873397&r1=1873396&r2=1873397&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_imagemap.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_imagemap.c Fri Jan 31 02:38:05 2020
@@ -477,7 +477,7 @@ static void menu_header(request_rec *r,
{
ap_set_content_type(r, "text/html; charset=ISO-8859-1");
- ap_rvputs(r, DOCTYPE_HTML_3_2, "<html><head>\n<title>Menu for ",
+ ap_rvputs(r, DOCTYPE_HTML_4_01, "<html><head>\n<title>Menu for ",
ap_escape_html(r->pool, r->uri),
"</title>\n</head><body>\n", NULL);
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c?rev=1873397&r1=1873396&r2=1873397&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c Fri Jan 31 02:38:05 2020
@@ -1564,7 +1564,7 @@ static void balancer_display_page(reques
}
else {
ap_set_content_type(r, "text/html; charset=ISO-8859-1");
- ap_rputs(DOCTYPE_HTML_3_2
+ ap_rputs(DOCTYPE_HTML_4_01
"<html><head><title>Balancer Manager</title>\n", r);
ap_rputs("<style type='text/css'>\n"
"table {\n"
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c?rev=1873397&r1=1873396&r2=1873397&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c Fri Jan 31 02:38:05 2020
@@ -524,7 +524,7 @@ static apr_status_t proxy_send_dir_filte
/* print "ftp://host/" */
escpath = ap_escape_html(p, path);
- str = apr_psprintf(p, DOCTYPE_HTML_3_2
+ str = apr_psprintf(p, DOCTYPE_HTML_4_01
"<html>\n <head>\n <title>%s%s%s</title>\n"
"<base href=\"%s%s%s\">\n"
" </head>\n"