summaryrefslogtreecommitdiffstats
path: root/server/scoreboard.c
diff options
context:
space:
mode:
authorWilliam A. Rowe Jr <wrowe@apache.org>2016-04-28 17:37:49 +0200
committerWilliam A. Rowe Jr <wrowe@apache.org>2016-04-28 17:37:49 +0200
commitb4ff39c9b6566d5f74066add1e20f2534682300e (patch)
tree4857642cd61a59349b2b1b8b1589cad5856f92ab /server/scoreboard.c
parentmod_http2: fix for connection cleanup on early close by client (diff)
downloadapache2-b4ff39c9b6566d5f74066add1e20f2534682300e.tar.xz
apache2-b4ff39c9b6566d5f74066add1e20f2534682300e.zip
Revert to 2.4.1 behavior and null the request and vhost as appropriate. PR 59333
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1741461 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/scoreboard.c')
-rw-r--r--server/scoreboard.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/server/scoreboard.c b/server/scoreboard.c
index 10128c0334..36fe995cbe 100644
--- a/server/scoreboard.c
+++ b/server/scoreboard.c
@@ -500,6 +500,9 @@ static int update_child_status_internal(int child_num,
else if (r) {
copy_request(ws->request, sizeof(ws->request), r);
}
+ else if (c) {
+ ws->request[0]='\0';
+ }
if (r && r->useragent_ip) {
if (!(val = ap_get_useragent_host(r, REMOTE_NOLOOKUP, NULL)))
@@ -524,6 +527,9 @@ static int update_child_status_internal(int child_num,
apr_cpystrn(ws->vhost, s->server_hostname, sizeof(ws->vhost));
}
}
+ else if (c) {
+ ws->vhost[0]='\0';
+ }
if (c) {
val = ap_get_protocol(c);