From 0514fb4a44a892ae0f4899eeadd709e287a8fc37 Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Sat, 13 Jan 2018 15:31:05 +0000 Subject: Merge r1740910, r1741277, r1820809 from trunk: event: update worker score keepalive status. 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. Follow up to r1740910: CHANGES entry. Submitted by: ylavic, wrowe, ylavic Reviewed by: ylavic, icing, jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1821068 13f79535-47bb-0310-9956-ffa450edef68 --- server/mpm/event/event.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'server') diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c index 54c9256074..d456456a2a 100644 --- a/server/mpm/event/event.c +++ b/server/mpm/event/event.c @@ -1126,6 +1126,8 @@ read_request: start_lingering_close_blocking(cs); } else if (cs->pub.state == CONN_STATE_CHECK_REQUEST_LINE_READABLE) { + ap_update_child_status(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 * it will stay sorted in expiration time sequence. If brand new -- cgit v1.2.1