diff options
| author | Rainer Jung <rjung@apache.org> | 2016-05-08 13:53:37 +0000 |
|---|---|---|
| committer | Rainer Jung <rjung@apache.org> | 2016-05-08 13:53:37 +0000 |
| commit | 7af076195974d9d827b33090d729119ab6a72c2c (patch) | |
| tree | 763fd610895e2caf46646c174f857b66c0bd6500 /modules | |
| parent | 2809bf81d5c371b989014f26bd36da08f994efe3 (diff) | |
| download | httpd-7af076195974d9d827b33090d729119ab6a72c2c.tar.gz | |
Fix yet another case where we clobber the
server-status request info when a timeout happens.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1742822 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/http/http_core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/http/http_core.c b/modules/http/http_core.c index 90ae92b6f2..a91f9db8ed 100644 --- a/modules/http/http_core.c +++ b/modules/http/http_core.c @@ -148,7 +148,8 @@ static int ap_process_http_async_connection(conn_rec *c) c->keepalive = AP_CONN_UNKNOWN; /* process the request if it was read without error */ - ap_update_child_status(c->sbh, SERVER_BUSY_WRITE, r); + ap_update_child_status(c->sbh, SERVER_BUSY_WRITE, + r->the_request ? r : NULL); if (r->status == HTTP_OK) { cs->state = CONN_STATE_HANDLER; ap_process_async_request(r); @@ -203,7 +204,8 @@ static int ap_process_http_sync_connection(conn_rec *c) c->keepalive = AP_CONN_UNKNOWN; /* process the request if it was read without error */ - ap_update_child_status(c->sbh, SERVER_BUSY_WRITE, r); + ap_update_child_status(c->sbh, SERVER_BUSY_WRITE, + r->the_request ? r : NULL); if (r->status == HTTP_OK) { if (cs) cs->state = CONN_STATE_HANDLER; |