From 1bbf7d21bb0511a2ca6dcb5f4d8573530dfa90b1 Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Tue, 29 May 2018 21:27:43 +0000 Subject: [PATCH] Backported in r1832495. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1832496 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 6 ------ 1 file changed, 6 deletions(-) diff --git a/STATUS b/STATUS index 41940884f8..2995eb62a7 100644 --- a/STATUS +++ b/STATUS @@ -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 ] -- 2.40.0