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

Posted to cvs@httpd.apache.org by yl...@apache.org on 2018/05/29 21:27:43 UTC

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

Author: ylavic
Date: Tue May 29 21:27:43 2018
New Revision: 1832496

URL: http://svn.apache.org/viewvc?rev=1832496&view=rev
Log:
Backported in r1832495.

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=1832496&r1=1832495&r2=1832496&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue May 29 21:27:43 2018
@@ -135,12 +135,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_ssl: Restore 2.4.29 behaviour in SSL vhost merging/enabling
-              which broke some rare but previously-working configs.
-     trunk patch: https://svn.apache.org/r1829513
-     2.4.x patch: svn merge -c 1829513 ^/httpd/httpd/trunk .
-     +1: jorton, jim, ylavic
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]