diff options
author | Stefan Eissing <icing@apache.org> | 2016-01-21 16:36:33 +0000 |
---|---|---|
committer | Stefan Eissing <icing@apache.org> | 2016-01-21 16:36:33 +0000 |
commit | 909aa9a87b7c5e7cf952bae5749d66eb21789325 (patch) | |
tree | 0b34835f45edcdf473b7cf3efbccf89200b57186 /modules/generators | |
parent | 0b9bd6c0ba70b916cdbd77243c2a41e5c3395765 (diff) | |
download | httpd-909aa9a87b7c5e7cf952bae5749d66eb21789325.tar.gz |
scoreboard addition of protocol, new ap_udpte_child_status methods
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1726009 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/generators')
-rw-r--r-- | modules/generators/mod_status.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/modules/generators/mod_status.c b/modules/generators/mod_status.c index 9bd4e8aa04..4ff9df1988 100644 --- a/modules/generators/mod_status.c +++ b/modules/generators/mod_status.c @@ -662,7 +662,7 @@ static int status_handler(request_rec *r) #endif "<th>SS</th><th>Req</th>" "<th>Conn</th><th>Child</th><th>Slot</th>" - "<th>Client</th><th>VHost</th>" + "<th>Client</th><th>Protocol</th><th>VHost</th>" "<th>Request</th></tr>\n\n", r); for (i = 0; i < server_limit; ++i) { @@ -776,13 +776,15 @@ static int status_handler(request_rec *r) format_byte_out(r, bytes); ap_rputs(")\n", r); ap_rprintf(r, - " <i>%s {%s}</i> <b>[%s]</b><br />\n\n", + " <i>%s {%s}</i> <i>(%s)</i> <b>[%s]</b><br />\n\n", ap_escape_html(r->pool, ws_record->client), ap_escape_html(r->pool, ap_escape_logitem(r->pool, ws_record->request)), ap_escape_html(r->pool, + ws_record->protocol), + ap_escape_html(r->pool, ws_record->vhost)); } else { /* !no_table_report */ @@ -860,11 +862,13 @@ static int status_handler(request_rec *r) (float)conn_bytes / KBYTE, (float) my_bytes / MBYTE, (float)bytes / MBYTE); - ap_rprintf(r, "</td><td>%s</td><td nowrap>%s</td>" + ap_rprintf(r, "</td><td>%s</td><td>%s</td><td nowrap>%s</td>" "<td nowrap>%s</td></tr>\n\n", ap_escape_html(r->pool, ws_record->client), ap_escape_html(r->pool, + ws_record->protocol), + ap_escape_html(r->pool, ws_record->vhost), ap_escape_html(r->pool, ap_escape_logitem(r->pool, |