From: Stefan Fritsch Date: Mon, 13 Jun 2011 11:11:48 +0000 (+0000) Subject: Merge repeated calls of ap_rputs. X-Git-Tag: 2.3.13~57 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=032acb7d21b409e2065fcbe30e87ec4ae2bc5fd7;p=thirdparty%2Fapache%2Fhttpd.git Merge repeated calls of ap_rputs. Submitted by: Christophe JAILLET PR: 51330 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1135085 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/generators/mod_status.c b/modules/generators/mod_status.c index 8e2c22e33a6..6f143340e1b 100644 --- a/modules/generators/mod_status.c +++ b/modules/generators/mod_status.c @@ -373,9 +373,10 @@ static int status_handler(request_rec *r) if (!short_report) { ap_rputs(DOCTYPE_HTML_3_2 - "\nApache Status\n\n", - r); - ap_rputs("

Apache Server Status for ", r); + "\n" + "Apache Status\n" + "\n" + "

Apache Server Status for ", r); ap_rvputs(r, ap_get_server_name(r), " (via ", r->connection->local_ip, ")

\n\n", NULL); ap_rvputs(r, "
Server Version: ", @@ -487,25 +488,25 @@ static int status_handler(request_rec *r) if (short_report) ap_rputs("\n", r); else { - ap_rputs("\n", r); - ap_rputs("

Scoreboard Key:
\n", r); - ap_rputs("\"_\" Waiting for Connection, \n", r); - ap_rputs("\"S\" Starting up, \n", r); - ap_rputs("\"R\" Reading Request,
\n", r); - ap_rputs("\"W\" Sending Reply, \n", r); - ap_rputs("\"K\" Keepalive (read), \n", r); - ap_rputs("\"D\" DNS Lookup,
\n", r); - ap_rputs("\"C\" Closing connection, \n", r); - ap_rputs("\"L\" Logging, \n", r); - ap_rputs("\"G\" Gracefully finishing,
\n", r); - ap_rputs("\"I\" Idle cleanup of worker, \n", r); - ap_rputs("\".\" Open slot with no current process,
\n", r); - ap_rputs("

\n", r); + ap_rputs("\n" + "

Scoreboard Key:
\n" + "\"_\" Waiting for Connection, \n" + "\"S\" Starting up, \n" + "\"R\" Reading Request,
\n" + "\"W\" Sending Reply, \n" + "\"K\" Keepalive (read), \n" + "\"D\" DNS Lookup,
\n" + "\"C\" Closing connection, \n" + "\"L\" Logging, \n" + "\"G\" Gracefully finishing,
\n" + "\"I\" Idle cleanup of worker, \n" + "\".\" Open slot with no current process,
\n" + "

\n", r); if (!ap_extended_status) { int j; int k = 0; - ap_rputs("PID Key:
\n", r); - ap_rputs("

\n", r);
+            ap_rputs("PID Key: 
\n"
+                     "
\n", r);
             for (i = 0; i < server_limit; ++i) {
                 for (j = 0; j < thread_limit; ++j) {
                     int indx = (i * thread_limit) + j;
@@ -524,8 +525,8 @@ static int status_handler(request_rec *r)
                 }
             }
 
-            ap_rputs("\n", r);
-            ap_rputs("
\n", r);
+            ap_rputs("\n"
+                     "
\n", r); } }