From 10f9a8910c9caf84b39aa66be4f4b42640be7857 Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Sat, 28 Jul 2001 00:46:49 +0000 Subject: [PATCH] More obsessive changes to meet HTML 3.2, HTML 4.01 Transitional and XHTML 1.0 Transitional git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89750 13f79535-47bb-0310-9956-ffa450edef68 --- modules/generators/mod_info.c | 98 ++++++++++++++++++----------------- server/core.c | 12 ++--- server/protocol.c | 8 +-- 3 files changed, 61 insertions(+), 57 deletions(-) diff --git a/modules/generators/mod_info.c b/modules/generators/mod_info.c index 04ac10ad16..3cf4ffdf5b 100644 --- a/modules/generators/mod_info.c +++ b/modules/generators/mod_info.c @@ -201,20 +201,20 @@ static void mod_info_module_cmds(request_rec * r, const command_rec * cmds, apr_snprintf(htmlstring, sizeof(htmlstring), "%s %s", tmptree->parent->directive, tmptree->parent->args); - ap_rprintf(r, "
%s
\n", + ap_rprintf(r, "
%s
\n", mod_info_html_cmd_string(htmlstring, buf, sizeof(buf), 0)); } if (nest == 2) { ap_rprintf(r, "
    %s " - "%s
\n", + "%s
\n", tmptree->directive, tmptree->args); } else if (nest == 1) { ap_rprintf(r, - "
  %s %s
\n", + "
  %s %s
\n", tmptree->directive, tmptree->args); } else { - ap_rprintf(r, "
%s %s
\n", + ap_rprintf(r, "
%s %s
\n", mod_info_html_cmd_string(tmptree->directive, buf, sizeof(buf), 0), tmptree->args); @@ -232,7 +232,7 @@ static void mod_info_module_cmds(request_rec * r, const command_rec * cmds, apr_snprintf(htmlstring, sizeof(htmlstring), "%s %s", tmptree->parent->directive, tmptree->parent->args); - ap_rprintf(r, "
%s
\n", + ap_rprintf(r, "
%s
\n", mod_info_html_cmd_string(htmlstring, buf, sizeof(buf), 1)); block_start--; @@ -327,15 +327,16 @@ static void module_request_hook_participate(request_rec *r, module *modp) { int i, comma=0; - ap_rputs("
Request Phase Participation: \n", r); + ap_rputs("
Request Phase Participation:\n", r); for (i=0; request_hooks[i].name; i++) { module_participate(r, modp, &request_hooks[i], &comma); } if (!comma) { - ap_rputs(" none", r); + ap_rputs(" none", r); } + ap_rputs("
\n", r); } static const char *find_more_info(server_rec *s, const char *module_name) @@ -383,58 +384,58 @@ static int display_info(request_rec *r) ap_rputs(DOCTYPE_HTML_3_2 "Server Information\n", r); - ap_rputs("

Apache Server Information

\n", r); + ap_rputs("

Apache Server Information

\n", r); if (!r->args || strcasecmp(r->args, "list")) { if (!r->args) { - ap_rputs("Server Settings, ", r); + ap_rputs("
Server Settings, ", r); for (modp = ap_top_module; modp; modp = modp->next) { ap_rprintf(r, "%s", modp->name, modp->name); if (modp->next) { ap_rputs(", ", r); } } - ap_rputs("
", r); + ap_rputs("
", r); } if (!r->args || !strcasecmp(r->args, "server")) { int max_daemons, forked, threaded; - ap_rprintf(r, "Server Version: " - "%s
\n", + ap_rprintf(r, "
Server Version: " + "%s
\n", ap_get_server_version()); - ap_rprintf(r, "Server Built: " - "%s
\n", + ap_rprintf(r, "
Server Built: " + "%s
\n", ap_get_server_built()); - ap_rprintf(r, "API Version: " - "%d:%d
\n", + ap_rprintf(r, "
API Version: " + "%d:%d
\n", MODULE_MAGIC_NUMBER_MAJOR, MODULE_MAGIC_NUMBER_MINOR); - ap_rprintf(r, "Hostname/port: " - "%s:%u
\n", + ap_rprintf(r, "
Hostname/port: " + "%s:%u
\n", serv->server_hostname, serv->port); - ap_rprintf(r, "Timeouts: " + ap_rprintf(r, "
Timeouts: " "connection: %d    " - "keep-alive: %d
", + "keep-alive: %d
", serv->timeout, serv->keep_alive_timeout); ap_mpm_query(AP_MPMQ_MAX_DAEMON_USED, &max_daemons); ap_mpm_query(AP_MPMQ_IS_THREADED, &threaded); ap_mpm_query(AP_MPMQ_IS_FORKED, &forked); - ap_rprintf(r, "MPM used is %s
\n", ap_show_mpm()); - ap_rprintf(r, "MPM Information: " - "Max Daemons: %d Threaded: %s Forked: %s
\n", + ap_rprintf(r, "
MPM Name: %s
\n", ap_show_mpm()); + ap_rprintf(r, "
MPM Information: " + "Max Daemons: %d Threaded: %s Forked: %s
\n", max_daemons, threaded ? "yes" : "no", forked ? "yes" : "no"); - ap_rprintf(r, "Server Root: " - "%s
\n", ap_server_root); - ap_rprintf(r, "Config File: " - "%s
\n", SERVER_CONFIG_FILE); + ap_rprintf(r, "
Server Root: " + "%s
\n", ap_server_root); + ap_rprintf(r, "
Config File: " + "%s
\n", SERVER_CONFIG_FILE); + ap_rputs("
", r); } - ap_rputs("
", r); for (modp = ap_top_module; modp; modp = modp->next) { if (!r->args || !strcasecmp(modp->name, r->args)) { - ap_rprintf(r, "
Module Name: " - "%s\n", + ap_rprintf(r, "
Module Name: " + "%s
\n", modp->name, modp->name); - ap_rputs("
Content handlers:", r); + ap_rputs("
Content handlers: ", r); #ifdef NEVERMORE hand = modp->handlers; if (hand) { @@ -452,17 +453,18 @@ static int display_info(request_rec *r) } } else { - ap_rputs(" none", r); + ap_rputs(" none", r); } #else if (module_find_hook(modp, ap_hook_get_handler)) { - ap_rputs(" yes", r); + ap_rputs(" yes", r); } else { - ap_rputs(" none", r); + ap_rputs(" none", r); } #endif - ap_rputs("
Configuration Phase Participation: \n", + ap_rputs("
", r); + ap_rputs("
Configuration Phase Participation:\n", r); if (modp->create_dir_config) { if (comma) { @@ -493,14 +495,15 @@ static int display_info(request_rec *r) comma = 1; } if (!comma) - ap_rputs(" none", r); + ap_rputs(" none", r); comma = 0; + ap_rputs("
", r); module_request_hook_participate(r, modp); - ap_rputs("
Module Directives: ", r); cmd = modp->cmds; if (cmd) { + ap_rputs("
Module Directives:
", r); while (cmd) { if (cmd->name) { ap_rprintf(r, "
%s - ", @@ -509,44 +512,45 @@ static int display_info(request_rec *r) if (cmd->errmsg) { ap_rputs(cmd->errmsg, r); } - ap_rputs("\n", r); + ap_rputs("
\n", r); } else { break; } cmd++; } - ap_rputs("
Current Configuration:\n", r); + ap_rputs("
Current Configuration:
\n", r); mod_info_module_cmds(r, modp->cmds, ap_conftree); } else { - ap_rputs(" none\n", r); + ap_rputs("
Module Directives: none
", r); } more_info = find_more_info(serv, modp->name); if (more_info) { - ap_rputs("
Additional Information:\n
", + ap_rputs("
Additional Information:\n
", r); ap_rputs(more_info, r); + ap_rputs("
", r); } - ap_rputs("
\n", r); + ap_rputs("
\n", r); if (r->args) { break; } } } if (!modp && r->args && strcasecmp(r->args, "server")) { - ap_rputs("No such module\n", r); + ap_rputs("

No such module

\n", r); } } else { + ap_rputs("
Server Module List
", r); for (modp = ap_top_module; modp; modp = modp->next) { + ap_rputs("
", r); ap_rputs(modp->name, r); - if (modp->next) { - ap_rputs("
", r); - } + ap_rputs("
", r); } + ap_rputs("
", r); } - ap_rputs("
\n", r); ap_rputs(ap_psignature("",r), r); ap_rputs("\n", r); /* Done, turn off timeout, close file and return */ diff --git a/server/core.c b/server/core.c index 2f566fbd82..ff74687bff 100644 --- a/server/core.c +++ b/server/core.c @@ -2168,15 +2168,15 @@ AP_DECLARE(const char *) ap_psignature(const char *prefix, request_rec *r) apr_snprintf(sport, sizeof sport, "%u", (unsigned) ap_get_server_port(r)); if (conf->server_signature == srv_sig_withmail) { - return apr_pstrcat(r->pool, prefix, "
" AP_SERVER_BASEVERSION - " Server at pool, prefix, "
" AP_SERVER_BASEVERSION + " Server at server->server_admin, "\">", - ap_get_server_name(r), " Port ", sport, - "
\n", NULL); + ap_get_server_name(r), " Port ", sport, + "
\n", NULL); } - return apr_pstrcat(r->pool, prefix, "
" AP_SERVER_BASEVERSION + return apr_pstrcat(r->pool, prefix, "
" AP_SERVER_BASEVERSION " Server at ", ap_get_server_name(r), " Port ", sport, - "
\n", NULL); + "
\n", NULL); } /* diff --git a/server/protocol.c b/server/protocol.c index d62a1fa78f..5005b20bfc 100644 --- a/server/protocol.c +++ b/server/protocol.c @@ -511,9 +511,9 @@ static void get_mime_headers(request_rec *r) apr_pstrcat(r->pool, "Size of a request header field " "exceeds server limit.

\n" - "

\n",
+				       "
\n",
 				       ap_escape_html(r->pool, field),
-				       "
\n", NULL));
+				       "
\n", NULL)); return; } copy = apr_palloc(r->pool, len + 1); @@ -525,9 +525,9 @@ static void get_mime_headers(request_rec *r) apr_pstrcat(r->pool, "Request header field is missing " "colon separator.

\n" - "

\n",
+				       "
\n",
 				       ap_escape_html(r->pool, copy),
-				       "
\n", NULL));
+				       "
\n", NULL)); return; } -- 2.40.0