diff options
| author | Stefan Fritsch <sf@sfritsch.de> | 2016-07-05 23:24:12 +0200 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2016-07-05 23:24:12 +0200 |
| commit | 0df95411a5fc890f06136a4c37361303221d06f1 (patch) | |
| tree | 66501eb992ffb8ee001ff6574d767de4a191dc4f /modules/http/http_core.c | |
| parent | 6a1126a22878b5756d49e667e6e43f879b366744 (diff) | |
| parent | d5ffc4eb85d71c901c85119cf873e343349e97e2 (diff) | |
| download | apache2-0df95411a5fc890f06136a4c37361303221d06f1.tar.gz | |
Merge remote-tracking branch 'origin/upstream'
Diffstat (limited to 'modules/http/http_core.c')
| -rw-r--r-- | modules/http/http_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/http/http_core.c b/modules/http/http_core.c index 345de810..57404e66 100644 --- a/modules/http/http_core.c +++ b/modules/http/http_core.c @@ -148,9 +148,9 @@ 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); if (r->status == HTTP_OK) { cs->state = CONN_STATE_HANDLER; + ap_update_child_status(c->sbh, SERVER_BUSY_WRITE, r); ap_process_async_request(r); /* After the call to ap_process_request, the * request pool may have been deleted. We set @@ -203,10 +203,10 @@ 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); if (r->status == HTTP_OK) { if (cs) cs->state = CONN_STATE_HANDLER; + ap_update_child_status(c->sbh, SERVER_BUSY_WRITE, r); ap_process_request(r); /* After the call to ap_process_request, the * request pool will have been deleted. We set |