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

diff --git a/CHANGES b/CHANGES
index 32d84b7b83c6585cc02525804ad024fd068a0ded..2495bf79002d80a7aa02fddb3710d34bc5361bee 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.30
  
+  *) mpm_event: Update scoreboard status for KeepAlive state.  [Yann Ylavic]
+
   *) mod_ldap: Fix a case where a full LDAP cache would continually fail to 
      purge old entries and log AH01323. PR61891.  
      [Hendrik Harms <hendrik.harms gmail.com>]

diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index 54c9256074106424d3845d1816600991b1ec42bc..d456456a2a9a73d82a0987aa6a91b09f6152ad46 100644 (file)
--- 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