]> granicus.if.org Git - apache/commitdiff
Revert 1741277 - need a scoreboard by slot context here
authorWilliam A. Rowe Jr <wrowe@apache.org>
Wed, 27 Apr 2016 15:39:53 +0000 (15:39 +0000)
committerWilliam A. Rowe Jr <wrowe@apache.org>
Wed, 27 Apr 2016 15:39:53 +0000 (15:39 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1741278 13f79535-47bb-0310-9956-ffa450edef68

server/mpm/event/event.c

index ebe3cf49053d2727816b033cd4e1b892fd6d1220..885ea5a05e61a61a492bfc293d230a02bd9cbccb 100644 (file)
@@ -1158,7 +1158,7 @@ read_request:
     if (cs->pub.state == CONN_STATE_WRITE_COMPLETION) {
         int not_complete_yet;
 
-        ap_update_child_status_from_conn(sbh, SERVER_BUSY_WRITE, NULL);
+        ap_update_child_status_from_conn(sbh, SERVER_BUSY_WRITE, c);
 
         not_complete_yet = ap_run_output_pending(c);
 
@@ -1199,7 +1199,7 @@ read_request:
         start_lingering_close_blocking(cs);
     }
     else if (cs->pub.state == CONN_STATE_CHECK_REQUEST_LINE_READABLE) {
-        ap_update_child_status_from_conn(sbh, SERVER_BUSY_KEEPALIVE, NULL);
+        ap_update_child_status_from_conn(sbh, SERVER_BUSY_KEEPALIVE, c);
 
         /* It greatly simplifies the logic to use a single timeout value per q
          * because the new element can just be added to the end of the list and