From: Jim Jagielski <jim@apache.org>
Date: Mon, 22 Jul 2019 12:47:51 +0000 (+0000)
Subject: and promote
X-Git-Tag: 2.4.40~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=366172e5216d8475feb2b9218350349826ed6926;p=thirdparty%2Fapache%2Fhttpd.git

and promote



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

diff --git a/STATUS b/STATUS
index 46a1ea615a3..19220eccb23 100644
--- a/STATUS
+++ b/STATUS
@@ -127,6 +127,38 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_ssl: fix gcc 8+ warnings
+     trunk: fixed as part of wider changes, r1809037
+     2.4.x: http://people.apache.org/~jorton/modssl_chain_warning.diff
+     [HOLD: this is obsoleted by icing's mod_ssl patch below]
+     +1: jorton, jfclere, jim
+
+  *) mod_ssl: offer new hooks for modules like mod_md and remove use of mod_md's optional functions.
+     trunk:
+        http://svn.apache.org/r1851621
+        http://svn.apache.org/r1852128
+        http://svn.apache.org/r1862075
+        http://svn.apache.org/r1862384
+     2.4.x:
+        https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/ssl-certicate-hooks.patch 
+     +1: icing, jorton, jim
+
+  *) core: fix crash when running with apr lib build with APR_POOL_DEBUG.
+     Observed with huge config and mod_security using long config lines.
+     trunk:
+        http://svn.apache.org/r1863179
+     2.4.x patch: svn merge -c 1863179 ^/httpd/httpd/trunk .
+     +1: rjung, icing, jim
+
+  *) mod_proxy_hcheck: mod_proxy_hcheck: mute "run from watchdog" message.
+     This is way too verbose (every 100ms) to be logged at any LogLevel.
+     CHANGES suggestion:
+     *) mod_proxy_hcheck: Mute extremely frequent debug message. [Yann Ylavic]
+     trunk:
+        http://svn.apache.org/r1853992
+     2.4.x patch: svn merge -c 1853992 ^/httpd/httpd/trunk .
+     +1: rjung, jailletc36, jim
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -173,29 +205,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/h2-keepalive+throttling-v3.patch
      +1: icing,, jim
 
-  *) mod_ssl: fix gcc 8+ warnings
-     trunk: fixed as part of wider changes, r1809037
-     2.4.x: http://people.apache.org/~jorton/modssl_chain_warning.diff
-     [HOLD: this is obsoleted by icing's mod_ssl patch below]
-     +1: jorton, jfclere, jim
-
-  *) mod_ssl: offer new hooks for modules like mod_md and remove use of mod_md's optional functions.
-     trunk:
-        http://svn.apache.org/r1851621
-        http://svn.apache.org/r1852128
-        http://svn.apache.org/r1862075
-        http://svn.apache.org/r1862384
-     2.4.x:
-        https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/ssl-certicate-hooks.patch 
-     +1: icing, jorton, jim
-
-  *) core: fix crash when running with apr lib build with APR_POOL_DEBUG.
-     Observed with huge config and mod_security using long config lines.
-     trunk:
-        http://svn.apache.org/r1863179
-     2.4.x patch: svn merge -c 1863179 ^/httpd/httpd/trunk .
-     +1: rjung, icing, jim
-
   *) mod_proxy_hcheck: Create the configure for mod_proxy_hcheck when used in BalancerMember.
      PR 60757
      CHANGES suggestion:
@@ -206,15 +215,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1853560 ^/httpd/httpd/trunk .
      +1: rjung, jim
 
-  *) mod_proxy_hcheck: mod_proxy_hcheck: mute "run from watchdog" message.
-     This is way too verbose (every 100ms) to be logged at any LogLevel.
-     CHANGES suggestion:
-     *) mod_proxy_hcheck: Mute extremely frequent debug message. [Yann Ylavic]
-     trunk:
-        http://svn.apache.org/r1853992
-     2.4.x patch: svn merge -c 1853992 ^/httpd/httpd/trunk .
-     +1: rjung, jailletc36, jim
-
   *) mod_proxy: Load balancer byrequests required when bytraffic chosen
      PR 62372
      CHANGES suggestion: