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: r1741278 - /httpd/httpd/trunk/server/mpm/event/event.c
Date: Wed, 27 Apr 2016 15:39:53 -0000
To: cvs@httpd.apache.org
From: wrowe@apache.org
Message-Id: <20160427153954.5A0C73A071E@svn01-us-west.apache.org>

Author: wrowe
Date: Wed Apr 27 15:39:53 2016
New Revision: 1741278

URL: http://svn.apache.org/viewvc?rev=1741278&view=rev
Log:
Revert 1741277 - need a scoreboard by slot context here

Modified:
    httpd/httpd/trunk/server/mpm/event/event.c

Modified: httpd/httpd/trunk/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=1741278&r1=1741277&r2=1741278&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Wed Apr 27 15:39:53 2016
@@ -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