]> granicus.if.org Git - apache/commitdiff
Revert 1742822, incorrect assumptions here
authorWilliam A. Rowe Jr <wrowe@apache.org>
Thu, 12 May 2016 14:50:09 +0000 (14:50 +0000)
committerWilliam A. Rowe Jr <wrowe@apache.org>
Thu, 12 May 2016 14:50:09 +0000 (14:50 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1743511 13f79535-47bb-0310-9956-ffa450edef68

modules/http/http_core.c

index a91f9db8ed6daebab1305625d7206968a55fce4a..90ae92b6f2eeeed3a27ca09351e346750f2c5371 100644 (file)
@@ -148,8 +148,7 @@ 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->the_request ? r : NULL);
+            ap_update_child_status(c->sbh, SERVER_BUSY_WRITE, r);
             if (r->status == HTTP_OK) {
                 cs->state = CONN_STATE_HANDLER;
                 ap_process_async_request(r);
@@ -204,8 +203,7 @@ 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->the_request ? r : NULL);
+        ap_update_child_status(c->sbh, SERVER_BUSY_WRITE, r);
         if (r->status == HTTP_OK) {
             if (cs)
                 cs->state = CONN_STATE_HANDLER;