www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00
Code Activity

PR62989: DOCTYPE tags in server-generated HTML.

Browse Source 
Submitted By: Andra Farkas <deepbluemistake gmail.com>, Giovanni Bechis <giovanni paclan.it>




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1873397 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eric Covener
2020-01-31 02:38:05 +00:00
parent d365a29a67
commit fbecdc0f1e
12 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,6 +1,9 @@
-*- coding: utf-8 -*- -*- coding: utf-8 -*-
Changes with Apache 2.5.1 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 *) mod_setenvif: Passing an env-variable parameter of "--early" in non-perdir
context runs directives from this module before `RequestHeader ... early` context runs directives from this module before `RequestHeader ... early`
are evaluated. This allows results of SetEnvIf conditionals to be used are evaluated. This allows results of SetEnvIf conditionals to be used

10
docs/docroot/index.html
View File

@@ -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>

4
include/httpd.h
View File

@@ -249,6 +249,10 @@ extern "C" {
#define DOCTYPE_HTML_4_0F "<!DOCTYPE HTML PUBLIC \"-//W3C//" \ #define DOCTYPE_HTML_4_0F "<!DOCTYPE HTML PUBLIC \"-//W3C//" \
"DTD HTML 4.0 Frameset//EN\"\n" \ "DTD HTML 4.0 Frameset//EN\"\n" \
"\"http://www.w3.org/TR/REC-html40/frameset.dtd\">\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 */ /** XHTML 1.0 Strict Doctype */
#define DOCTYPE_XHTML_1_0S "<!DOCTYPE html PUBLIC \"-//W3C//" \ #define DOCTYPE_XHTML_1_0S "<!DOCTYPE html PUBLIC \"-//W3C//" \
"DTD XHTML 1.0 Strict//EN\"\n" \ "DTD XHTML 1.0 Strict//EN\"\n" \

2
modules/dav/main/mod_dav.h
View File

@@ -50,7 +50,7 @@ extern "C" {
#define DAV_READ_BLOCKSIZE 2048 /* used for reading input blocks */ #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_2 "</title>\n</head><body>\n<h1>"
#define DAV_RESPONSE_BODY_3 "</h1>\n<p>" #define DAV_RESPONSE_BODY_3 "</h1>\n<p>"
#define DAV_RESPONSE_BODY_4 "</p>\n" #define DAV_RESPONSE_BODY_4 "</p>\n"

2
modules/examples/mod_example_hooks.c
View File

@@ -1007,7 +1007,7 @@ static int x_handler(request_rec *r)
* Now send our actual output. Since we tagged this as being * Now send our actual output. Since we tagged this as being
* "text/html", we need to embed any HTML. * "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("<HTML>\n", r);
ap_rputs(" <HEAD>\n", r); ap_rputs(" <HEAD>\n", r);
ap_rputs(" <TITLE>mod_example_hooks Module Content-Handler Output\n", r); ap_rputs(" <TITLE>mod_example_hooks Module Content-Handler Output\n", r);

2
modules/generators/mod_autoindex.c
View File

@@ -179,7 +179,7 @@ static void emit_preamble(request_rec *r, int xhtml, const char *title)
" <head>\n <title>Index of ", title, " <head>\n <title>Index of ", title,
"</title>\n", NULL); "</title>\n", NULL);
} else { } else {
ap_rvputs(r, DOCTYPE_HTML_3_2, ap_rvputs(r, DOCTYPE_HTML_4_01,
"<html>\n <head>\n" "<html>\n <head>\n"
" <title>Index of ", title, " <title>Index of ", title,
"</title>\n", NULL); "</title>\n", NULL);

2
modules/generators/mod_status.c
View File

@@ -412,7 +412,7 @@ static int status_handler(request_rec *r)
ap_get_loadavg(&t); ap_get_loadavg(&t);
if (!short_report) { if (!short_report) {
ap_rputs(DOCTYPE_HTML_3_2 ap_rputs(DOCTYPE_HTML_4_01
"<html><head>\n" "<html><head>\n"
"<title>Apache Status</title>\n" "<title>Apache Status</title>\n"
"</head><body>\n" "</head><body>\n"

2
modules/http/http_protocol.c
View File

@@ -1331,7 +1331,7 @@ AP_DECLARE(void) ap_send_error_response(request_rec *r, int recursive_error)
*/ */
ap_rvputs_proto_in_ascii(r, ap_rvputs_proto_in_ascii(r,
DOCTYPE_HTML_2_0 DOCTYPE_HTML_4_01
"<html><head>\n<title>", title, "<html><head>\n<title>", title,
"</title>\n</head><body>\n<h1>", h1, "</h1>\n", "</title>\n</head><body>\n<h1>", h1, "</h1>\n",
NULL); NULL);

2
modules/ldap/util_ldap.c
View File

@@ -173,7 +173,7 @@ static int util_ldap_handler(request_rec *r)
if (r->header_only) if (r->header_only)
return OK; return OK;
ap_rputs(DOCTYPE_HTML_3_2 ap_rputs(DOCTYPE_HTML_4_01
"<html><head><title>LDAP Cache Information</title></head>\n", r); "<html><head><title>LDAP Cache Information</title></head>\n", r);
ap_rputs("<body bgcolor='#ffffff'><h1 align=center>LDAP Cache Information" ap_rputs("<body bgcolor='#ffffff'><h1 align=center>LDAP Cache Information"
"</h1>\n", r); "</h1>\n", r);

2
modules/mappers/mod_imagemap.c
View File

@@ -477,7 +477,7 @@ static void menu_header(request_rec *r, char *menu)
{ {
ap_set_content_type(r, "text/html; charset=ISO-8859-1"); 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), ap_escape_html(r->pool, r->uri),
"</title>\n</head><body>\n", NULL); "</title>\n</head><body>\n", NULL);

2
modules/proxy/mod_proxy_balancer.c
View File

@@ -1564,7 +1564,7 @@ static void balancer_display_page(request_rec *r, proxy_server_conf *conf,
} }
else { else {
ap_set_content_type(r, "text/html; charset=ISO-8859-1"); 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); "<html><head><title>Balancer Manager</title>\n", r);
ap_rputs("<style type='text/css'>\n" ap_rputs("<style type='text/css'>\n"
"table {\n" "table {\n"

2
modules/proxy/mod_proxy_ftp.c
View File

@@ -524,7 +524,7 @@ static apr_status_t proxy_send_dir_filter(ap_filter_t *f,
/* print "ftp://host/" */ /* print "ftp://host/" */
escpath = ap_escape_html(p, path); 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" "<html>\n <head>\n <title>%s%s%s</title>\n"
"<base href=\"%s%s%s\">\n" "<base href=\"%s%s%s\">\n"
" </head>\n" " </head>\n"