From: William A. Rowe Jr Date: Wed, 27 Apr 2016 15:24:33 +0000 (+0000) Subject: Correct regressions introduced in r1137358 and r1740910. X-Git-Tag: 2.5.0-alpha~1694 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=289bf1d276825477c8083651038ae2c190ccd932;p=thirdparty%2Fapache%2Fhttpd.git Correct regressions introduced in r1137358 and r1740910. The conn_rec context may be passed only when setting up the initial connection, otherwise the request info is trashed. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1741277 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c index 885ea5a05e6..ebe3cf49053 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, c); + ap_update_child_status_from_conn(sbh, SERVER_BUSY_WRITE, NULL); 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, c); + ap_update_child_status_from_conn(sbh, SERVER_BUSY_KEEPALIVE, NULL); /* 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