You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2001/07/28 03:29:41 UTC
cvs commit: httpd-2.0/modules/mappers mod_imap.c mod_negotiation.c
wrowe 01/07/27 18:29:41
Modified: modules/http http_protocol.c
modules/mappers mod_imap.c mod_negotiation.c
Log:
Final pedantic HTML 3.2/4.01 Transitional + XHTML 1.0 Transitional
compliance changes. Note I've left alone the <P> tags, since they
are abused, misused, potentially unsalvageable and certainly more
effort than I care to expend in my quest for brainless end of week
keyboard exercise.
Revision Changes Path
1.337 +17 -17 httpd-2.0/modules/http/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/http/http_protocol.c,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -r1.336 -r1.337
--- http_protocol.c 2001/07/26 18:40:24 1.336
+++ http_protocol.c 2001/07/28 01:29:41 1.337
@@ -1570,22 +1570,22 @@
case HTTP_MOVED_TEMPORARILY:
case HTTP_TEMPORARY_REDIRECT:
return(apr_pstrcat(p,
- "The document has moved <A HREF=\"",
+ "The document has moved <a href=\"",
ap_escape_html(r->pool, location),
- "\">here</A>.<P>\n",
+ "\">here</a>.<P>\n",
NULL));
case HTTP_SEE_OTHER:
return(apr_pstrcat(p,
- "The answer to your request is located <A HREF=\"",
+ "The answer to your request is located <a href=\"",
ap_escape_html(r->pool, location),
- "\">here</A>.<P>\n",
+ "\">here</a>.<P>\n",
NULL));
case HTTP_USE_PROXY:
return(apr_pstrcat(p,
"This resource is only accessible "
"through the proxy\n",
ap_escape_html(r->pool, location),
- "<BR>\nYou will need to "
+ "<br />\nYou will need to "
"configure your client to use that proxy.<P>\n",
NULL));
case HTTP_PROXY_AUTHENTICATION_REQUIRED:
@@ -1657,25 +1657,25 @@
return(add_optional_notes(r, s1, "error-notes", "<P>\n"));
case HTTP_VARIANT_ALSO_VARIES:
return(apr_pstrcat(p,
- "A variant for the requested resource\n<PRE>\n",
+ "A variant for the requested resource\n<pre>\n",
ap_escape_html(r->pool, r->uri),
- "\n</PRE>\nis itself a negotiable resource. "
+ "\n</pre>\nis itself a negotiable resource. "
"This indicates a configuration error.<P>\n",
NULL));
case HTTP_REQUEST_TIME_OUT:
return("I'm tired of waiting for your request.\n");
case HTTP_GONE:
return(apr_pstrcat(p,
- "The requested resource<BR>",
+ "The requested resource<br />",
ap_escape_html(r->pool, r->uri),
- "<BR>\nis no longer available on this server "
+ "<br />\nis no longer available on this server "
"and there is no forwarding address.\n"
"Please remove all references to this resource.\n",
NULL));
case HTTP_REQUEST_ENTITY_TOO_LARGE:
return(apr_pstrcat(p,
- "The requested resource<BR>",
- ap_escape_html(r->pool, r->uri), "<BR>\n",
+ "The requested resource<br />",
+ ap_escape_html(r->pool, r->uri), "<br />\n",
"does not allow request data with ",
r->method,
" requests, or the amount of data provided in\n"
@@ -1696,8 +1696,8 @@
return(apr_pstrcat(p,
"The expectation given in the Expect request-header"
"\nfield could not be met by this server.<P>\n"
- "The client sent<PRE>\n Expect: ",
- apr_table_get(r->headers_in, "Expect"), "\n</PRE>\n"
+ "The client sent<pre>\n Expect: ",
+ apr_table_get(r->headers_in, "Expect"), "\n</pre>\n"
"but we only allow the 100-continue expectation.\n",
NULL));
case HTTP_UNPROCESSABLE_ENTITY:
@@ -1923,8 +1923,8 @@
ap_rvputs_proto_in_ascii(rlast,
DOCTYPE_HTML_2_0
- "<HTML><HEAD>\n<TITLE>", title,
- "</TITLE>\n</HEAD><BODY>\n<H1>", h1, "</H1>\n",
+ "<html><head>\n<title>", title,
+ "</title>\n</head><body>\n<h1>", h1, "</h1>\n",
NULL);
ap_rvputs_proto_in_ascii(rlast,
@@ -1937,8 +1937,8 @@
"\nerror was encountered while trying to use an "
"ErrorDocument to handle the request.\n", NULL);
}
- ap_rvputs_proto_in_ascii(rlast, ap_psignature("<HR>\n", r), NULL);
- ap_rvputs_proto_in_ascii(rlast, "</BODY></HTML>\n", NULL);
+ ap_rvputs_proto_in_ascii(rlast, ap_psignature("<hr />\n", r), NULL);
+ ap_rvputs_proto_in_ascii(rlast, "</body></html>\n", NULL);
}
ap_finalize_request_protocol(r);
}
1.33 +2 -2 httpd-2.0/modules/mappers/mod_imap.c
Index: mod_imap.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_imap.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- mod_imap.c 2001/02/28 15:24:07 1.32
+++ mod_imap.c 2001/07/28 01:29:41 1.33
@@ -527,7 +527,7 @@
"</title>\n</head><body>\n", NULL);
if (!strcasecmp(menu, "formatted")) {
- ap_rvputs(r, "<h1>Menu for ", r->uri, "</h1>\n<hr>\n\n", NULL);
+ ap_rvputs(r, "<h1>Menu for ", r->uri, "</h1>\n<hr />\n\n", NULL);
}
return;
@@ -539,7 +539,7 @@
ap_rputs("\n", r);
}
if (!strcasecmp(menu, "semiformatted")) {
- ap_rputs("<br>\n", r);
+ ap_rputs("<br />\n", r);
}
if (!strcasecmp(menu, "unformatted")) {
ap_rputs("\n", r);
1.61 +1 -1 httpd-2.0/modules/mappers/mod_negotiation.c
Index: mod_negotiation.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_negotiation.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- mod_negotiation.c 2001/07/26 15:53:15 1.60
+++ mod_negotiation.c 2001/07/28 01:29:41 1.61
@@ -2261,7 +2261,7 @@
* Note that if you change the number of substrings pushed, you also
* need to change the calculation of max_vlist_array above.
*/
- *((const char **) apr_array_push(arr)) = "<li><a href=\"";
+ *((const char **) apr_array_push(arr)) = "<li /><a href=\"";
*((const char **) apr_array_push(arr)) = filename;
*((const char **) apr_array_push(arr)) = "\">";
*((const char **) apr_array_push(arr)) = filename;