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 7da1f211946b2e315cc6018ed2f8df80bf6adf0d..5c33d9cefe52c97bd4dbee10d674f0aa8fcb416e 100644 (file)
--- 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