]> granicus.if.org Git - apache/commitdiff
Revert premature mis-commit of proposed patch (had only meant to test merging
authorWilliam A. Rowe Jr <wrowe@apache.org>
Fri, 13 May 2016 16:57:36 +0000 (16:57 +0000)
committerWilliam A. Rowe Jr <wrowe@apache.org>
Fri, 13 May 2016 16:57:36 +0000 (16:57 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1743704 13f79535-47bb-0310-9956-ffa450edef68

modules/http/http_core.c

index 57404e66ec75fbe2ba3613e20bcb3c0bb00c7843..345de8109ae119860b0fdb8bd393587760fa2a48 100644 (file)
@@ -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