Commit 9f52595f authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89753 13f79535-47bb-0310-9956-ffa450edef68
parent 06f5bb08

modules/http/http_protocol.c

+17 −17
Original line number Diff line number Diff line
@@ -1570,22 +1570,22 @@ static const char *get_canned_error_string(int status, 
	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 @@ static const char *get_canned_error_string(int status, 
		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 @@ static const char *get_canned_error_string(int status, 
	    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_DECLARE(void) ap_send_error_response(request_rec *r, int recursive_error) 


        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 @@ AP_DECLARE(void) ap_send_error_response(request_rec *r, int recursive_error) 
                      "\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);

}

modules/mappers/mod_imap.c

+2 −2
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ static void menu_header(request_rec *r, char *menu) 
           "</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 @@ static void menu_blank(request_rec *r, char *menu) 
        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);

modules/mappers/mod_negotiation.c

+1 −1
Original line number Diff line number Diff line
@@ -2261,7 +2261,7 @@ static char *make_variant_list(request_rec *r, negotiation_state *neg) 
         * 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;