From: Yann Ylavic <ylavic@apache.org>
Date: Mon, 16 Nov 2020 12:01:43 +0000 (+0000)
Subject: Propose, vote, promote. [skip ci]
X-Git-Tag: 2.4.47~234
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bc362a282df56921245363728798fa765eb57ea8;p=thirdparty%2Fapache%2Fhttpd.git

Propose, vote, promote. [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1883474 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 6c3c40eb6dc..3591db74edc 100644
--- a/STATUS
+++ b/STATUS
@@ -154,6 +154,23 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: http://people.apache.org/~covener/patches/wstunnel-decline.diff
      +1 covener, jim, rpluem, jfclere
 
+  *) mod_http2: Log requests and sent the configured error response in case of
+     early detected errors like too many or too long headers.
+     Trunk version of patch:
+        https://svn.apache.org/r1881620
+        https://svn.apache.org/r1881635
+     Backport version for 2.4.x of patch:
+        https://github.com/apache/httpd/pull/142
+        https://github.com/apache/httpd/pull/142.diff
+     +1: rpluem, giovanni, ylavic
+
+  *) core: Avoid a core dump if 'AllowOverride nonfatal' is used in a configuration
+     file.
+     Trunk version of patch:
+        https://svn.apache.org/r1881311
+    Backport version for 2.4.x of patch:
+     +1: jailletc36, giovanni, ylavic
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -207,10 +224,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-dav-functions2.patch
     +1: minfrin
 
-  *)  mpm_event: reset listener_is_wakeable on reload.
+  *) mpm_event: reset listener_is_wakeable on reload.
      trunk patch: http://svn.apache.org/r1877552
      2.4.x patch: svn merge -c 1877552 ^/httpd/httpd/trunk .
-     +1: 
+     +1: ylavic
 
   *) mod_rewrite: Extend the [CO] (cookie) flag of RewriteRule to accept a
      SameSite attribute.
@@ -235,28 +252,24 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       svn merge -c 1881303,1881304,1881305,1881306 ^/httpd/httpd/trunk .
      +1: jailletc36,
 
-  *) mod_http2: Log requests and sent the configured error response in case of
-     early detected errors like too many or too long headers.
-     Trunk version of patch:
-        https://svn.apache.org/r1881620
-        https://svn.apache.org/r1881635
-     Backport version for 2.4.x of patch:
-        https://github.com/apache/httpd/pull/142
-        https://github.com/apache/httpd/pull/142.diff
-     +1: rpluem, giovanni
-
-  *) core: Avoid a core dump if 'AllowOverride nonfatal' is used in a configuration
-     file.
-     Trunk version of patch:
-        https://svn.apache.org/r1881311
-    Backport version for 2.4.x of patch:
-     +1: jailletc36, giovanni
-
   *) core: Correctly strip unwanted headers on 304 response
      Trunk version of patch:
         http://svn.apache.org/r1881590
         http://svn.apache.org/r1881624
 
+  *) mpm_event: kill connections in keepalive state only when there is no more
+     workers available, not when the maximum number of connections is reached,
+     restoring prior to 2.4.30 behaviour.
+     trunk patch: http://svn.apache.org/r1883096
+     2.4.x patch: svn merge -c 1883096 ^/httpd/httpd/trunk .
+     +1: ylavic, 
+
+  *) mpm_event: don't reset connections after lingering close, restoring prior
+     to 2.4.28 behaviour.
+     trunk patch: http://svn.apache.org/r1883097
+     2.4.x patch: svn merge -c 1883097 ^/httpd/httpd/trunk .
+     +1: ylavic, 
+
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]