From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 24 May 2019 07:45:12 +0000 (+0000)
Subject: Vote, promote.
X-Git-Tag: 2.4.40~120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4e559ef2960e05452362d54d955028ac8114620;p=thirdparty%2Fapache%2Fhttpd.git

Vote, promote.

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

diff --git a/STATUS b/STATUS
index 866f6aa5f16..64040588012 100644
--- a/STATUS
+++ b/STATUS
@@ -164,6 +164,32 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      +1: jailletc36, jim, rjung
      jailletc36: this series relies on r1780280 backport (see above)
 
+  *) mod_proxy: allow SSLProxyCheckPeer* usage for all proxy modules.
+     PR 61857.  [Yann Ylavic]
+     Proposed (for trunk) by: Markus Gausling <markusgausling googlemail.com>
+     Reviewed (for trunk) by: ylavic
+     This also makes backporting the fixes for PR 63430 simpler and reduces code drift.
+     trunk patch: http://svn.apache.org/r1818726
+     2.4.x patch: http://home.apache.org/~rjung/patches/httpd-2.4.x-proxy-request-hostname.patch
+     +1: rjung, rpluem, ylavic
+     -1: 
+
+  *) mod_proxy/ssl: Proxy SSL client certificate configuration and other proxy
+     SSL configurations broken inside <Proxy> context.  PR 63430.
+     [Ruediger Pluem, Yann Ylavic]
+     Plus:
+     Follow up to r1859371: extend to other ap_proxy_connection_create[_ex]() users.
+     This function now now handles SSL reuse as well as the "proxy-request-hostname"
+     note (SNI), so let's also call it unconditionnaly in all proxy modules.
+     On the mod_ssl side, since this note has the lifetime of the connection, don't
+     reset/unset it during handshake (ssl_io_filter_handshake).
+     The 2.4 backport patch applies clean after backporting r1818726 above.
+     trunk patch: http://svn.apache.org/r1859371
+                  http://svn.apache.org/r1859422
+     2.4.x patch: http://home.apache.org/~rjung/patches/httpd-2.4.x-proxy-ssl-proxy-section-r1859371-r1859422.patch
+     +1: rjung, rpluem, ylavic
+     -1: 
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -255,32 +281,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1707084,1707093,1707159,1707362 ^/httpd/httpd/trunk .
      +1: icing
 
-  *) mod_proxy: allow SSLProxyCheckPeer* usage for all proxy modules.
-     PR 61857.  [Yann Ylavic]
-     Proposed (for trunk) by: Markus Gausling <markusgausling googlemail.com>
-     Reviewed (for trunk) by: ylavic
-     This also makes backporting the fixes for PR 63430 simpler and reduces code drift.
-     trunk patch: http://svn.apache.org/r1818726
-     2.4.x patch: http://home.apache.org/~rjung/patches/httpd-2.4.x-proxy-request-hostname.patch
-     +1: rjung, rpluem
-     -1: 
-
-  *) mod_proxy/ssl: Proxy SSL client certificate configuration and other proxy
-     SSL configurations broken inside <Proxy> context.  PR 63430.
-     [Ruediger Pluem, Yann Ylavic]
-     Plus:
-     Follow up to r1859371: extend to other ap_proxy_connection_create[_ex]() users.
-     This function now now handles SSL reuse as well as the "proxy-request-hostname"
-     note (SNI), so let's also call it unconditionnaly in all proxy modules.
-     On the mod_ssl side, since this note has the lifetime of the connection, don't
-     reset/unset it during handshake (ssl_io_filter_handshake).
-     The 2.4 backport patch applies clean after backporting r1818726 above.
-     trunk patch: http://svn.apache.org/r1859371
-                  http://svn.apache.org/r1859422
-     2.4.x patch: http://home.apache.org/~rjung/patches/httpd-2.4.x-proxy-ssl-proxy-section-r1859371-r1859422.patch
-     +1: rjung, rpluem
-     -1: 
-     
   *) mod_http2: Incorporate the lastest trunk revision with code improvements and
      better connection reuse handling in mod_proxy_http2. [Ruediger Pluem, Stefan Eissing]
      trunk patch: http://svn.apache.org/r1859213