From: Jim Jagielski <jim@apache.org>
Date: Tue, 22 Nov 2016 13:40:56 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.4.24~105
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00ed8988513131deb1c1fb1a1340b98d6a7a8b18;p=thirdparty%2Fapache%2Fhttpd.git

promote


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

diff --git a/STATUS b/STATUS
index 1610bd2febe..b82e9f83a9d 100644
--- a/STATUS
+++ b/STATUS
@@ -117,6 +117,11 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_ssl: Fix quick renegotiation (OptRenegotiaton) with no intermediate
+     in the client certificate chain.  PR 55786.
+     trunk patch: http://svn.apache.org/r1756542
+     2.4.x patch: trunk works (modulo CHANGES)
+     +1: ylavic, icing (by inspectin), jim
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -152,12 +157,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      headers (GMT now, GMT now Europe/Paris, GMT tomorrow, GMT yesterday, PST now).
      +1: elukey
 
-  *) mod_ssl: Fix quick renegotiation (OptRenegotiaton) with no intermediate
-     in the client certificate chain.  PR 55786.
-     trunk patch: http://svn.apache.org/r1756542
-     2.4.x patch: trunk works (modulo CHANGES)
-     +1: ylavic, icing (by inspectin), jim
-
   *) mod_proxy, mod_ssl: Handle SSLProxy* directives in <Proxy> sections,
      allowing per backend TLS configuration.
      trunk patch: http://svn.apache.org/r1740928