From: Eric Covener <covener@apache.org>
Date: Tue, 9 Oct 2018 23:20:59 +0000 (+0000)
Subject: vote/promote
X-Git-Tag: 2.4.36~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b35a37db85e2c33eddcd85bf468cb8ab879d254;p=thirdparty%2Fapache%2Fhttpd.git

vote/promote



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

diff --git a/STATUS b/STATUS
index 023e7d443f5..3dae59aec79 100644
--- a/STATUS
+++ b/STATUS
@@ -143,6 +143,14 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      (requires r1738415 and r1826930 above to resolve conflict)
      +1: minfrin, jim, ylavic
 
+  *) mod_ssl: Fix a regression that the configuration settings for verify mode
+     and verify depth were taken from the frontend connection in case of
+     connections by the proxy to the backend. PR 62769.
+     trunk patch: http://svn.apache.org/r1842540
+     2.4.x: trunk works (modulo CHANGES)
+            svn merge -c r1842540 ^/httpd/httpd/trunk .
+     +1: ylavic, icing (by inspection), covener
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -194,14 +202,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.4.x patch: http://home.apache.org/~jim/patches/socache_redisv2.patch
       +1: jim, minfrin
 
-  *) mod_ssl: Fix a regression that the configuration settings for verify mode
-     and verify depth were taken from the frontend connection in case of
-     connections by the proxy to the backend. PR 62769.
-     trunk patch: http://svn.apache.org/r1842540
-     2.4.x: trunk works (modulo CHANGES)
-            svn merge -c r1842540 ^/httpd/httpd/trunk .
-     +1: ylavic, icing (by inspection)
-
   *) mod_brotli, mod_deflate: Restore the separate handling of 304 Not Modified
      responses allowing these modules to properly set or fix-up the response
      headers such as Vary or ETag. Fixes a potential violation of RFC7232, 4.1.