Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1743704 - /httpd/httpd/branches/2.4.x/modules/http/http_core.c
Date: Fri, 13 May 2016 16:57:36 -0000
To: cvs@httpd.apache.org
From: wrowe@apache.org
Message-Id: <20160513165736.E875A3A0113@svn01-us-west.apache.org>
archived-at: Fri, 13 May 2016 16:57:40 -0000

Author: wrowe
Date: Fri May 13 16:57:36 2016
New Revision: 1743704

URL: http://svn.apache.org/viewvc?rev=1743704&view=rev
Log:
Revert premature mis-commit of proposed patch (had only meant to test merging

Modified:
    httpd/httpd/branches/2.4.x/modules/http/http_core.c

Modified: httpd/httpd/branches/2.4.x/modules/http/http_core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http/http_core.c?rev=1743704&r1=1743703&r2=1743704&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http/http_core.c (original)
+++ httpd/httpd/branches/2.4.x/modules/http/http_core.c Fri May 13 16:57:36 2016
@@ -148,9 +148,9 @@ static int ap_process_http_async_connect
             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_connecti
         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