From: William A. Rowe Jr Date: Fri, 13 May 2016 16:57:36 +0000 (+0000) Subject: Revert premature mis-commit of proposed patch (had only meant to test merging X-Git-Tag: 2.4.21~172 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94fdc436443744f6288cd9ee4da6ab81750ffef6;p=thirdparty%2Fapache%2Fhttpd.git Revert premature mis-commit of proposed patch (had only meant to test merging git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1743704 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/http/http_core.c b/modules/http/http_core.c index 57404e66ec7..345de8109ae 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