From: Joe Orton <jorton@apache.org>
Date: Fri, 9 Nov 2018 08:31:39 +0000 (+0000)
Subject: r1846112 is a bit too tomcatty, counter-proposal...
X-Git-Tag: 2.4.38~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d70b87099c077808d7d91282ac417e684daa778b;p=thirdparty%2Fapache%2Fhttpd.git

r1846112 is a bit too tomcatty, counter-proposal...


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

diff --git a/STATUS b/STATUS
index 7da1f211946..5c33d9cefe5 100644
--- a/STATUS
+++ b/STATUS
@@ -209,10 +209,15 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: icing, jim
 
   *) mod_ssl: Fixes PR 62654 where "require ssl" did not work on HTTP/2
-     connections.
-     trunk patch: http://svn.apache.org/r1846112
-     2.4.x patch: svn merge -c 1846112 ^/httpd/httpd/trunk .
-     +1: icing, 
+     connections, and PR 61519 where $HTTPS was incorrect for the
+     "SSLEngine optional" case.
+     trunk patch: http://svn.apache.org/r1829250
+                  http://svn.apache.org/r1829263
+                  http://svn.apache.org/r1846111
+     2.4.x patch:
+       http://people.apache.org/~jorton/modssl_is_tls.diff
+       svn merge --record-only -c 1829250,1829263,1846111 ^/httpd/httpd/trunk .
+     +1: jorton, 
 
   *) mod_http2: change in cleanup strategy for slave connections.
      trunk patch: http://svn.apache.org/r1846125