From: Jim Jagielski <jim@apache.org>
Date: Fri, 5 Oct 2018 11:52:15 +0000 (+0000)
Subject: promote w/ 3
X-Git-Tag: 2.4.36~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9eecd2f02438c53d6efe17e0a6d94c78aa9745e2;p=thirdparty%2Fapache%2Fhttpd.git

promote w/ 3



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

diff --git a/STATUS b/STATUS
index dd23feaf646..decb5d72bb1 100644
--- a/STATUS
+++ b/STATUS
@@ -124,6 +124,12 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_ssl: downgrade logging of requests without SNI when SSLStrictSNIVHostCheck is on
+              (just a quality of life improvement for log-reading admins):
+     trunk: http://svn.apache.org/r1841446
+     trunk: http://svn.apache.org/r1841455
+     2.4.x branch: svn merge -c 1841446,1841455 ^/httpd/httpd/trunk .
+     +1: icing, minfrin, jim
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -182,13 +188,6 @@ 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-ab.patch
      +1: minfrin, jim
 
-  *) mod_ssl: downgrade logging of requests without SNI when SSLStrictSNIVHostCheck is on
-              (just a quality of life improvement for log-reading admins):
-     trunk: http://svn.apache.org/r1841446
-     trunk: http://svn.apache.org/r1841455
-     2.4.x branch: svn merge -c 1841446,1841455 ^/httpd/httpd/trunk .
-     +1: icing, minfrin, jim
-
   *) ab: Add client certificate support.
      trunk: http://svn.apache.org/r1841784
      2.4.x: svn merge -c r1841784 ^/httpd/httpd/trunk .