You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by jo...@apache.org on 2018/11/09 08:31:39 UTC

svn commit: r1846218 - /httpd/httpd/branches/2.4.x/STATUS

Author: jorton
Date: Fri Nov  9 08:31:39 2018
New Revision: 1846218

URL: http://svn.apache.org/viewvc?rev=1846218&view=rev
Log:
r1846112 is a bit too tomcatty, counter-proposal...

Modified:
    httpd/httpd/branches/2.4.x/STATUS

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1846218&r1=1846217&r2=1846218&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Fri Nov  9 08:31:39 2018
@@ -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