From: William A. Rowe Jr <wrowe@apache.org>
Date: Wed, 27 Apr 2016 15:39:53 +0000 (+0000)
Subject: Revert 1741277 - need a scoreboard by slot context here
X-Git-Tag: 2.5.0-alpha~1693
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2343bb3829ed61f33dd22b253bafa22bffbb9baf;p=thirdparty%2Fapache%2Fhttpd.git

Revert 1741277 - need a scoreboard by slot context here

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1741278 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index ebe3cf49053..885ea5a05e6 100644
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -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