From: Joe Orton Date: Thu, 19 Apr 2018 08:09:10 +0000 (+0000) Subject: 100% guarantee no mistakes in this commit. X-Git-Tag: 2.4.34~200 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4c93ce0d9ed797770cfb8a7a421836551afcc8ac;p=apache 100% guarantee no mistakes in this commit. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1829515 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 25d80ed73a..64ba8e5e90 100644 --- a/STATUS +++ b/STATUS @@ -250,7 +250,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: *) 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 1828920 ^/httpd/httpd/trunk . + 2.4.x patch: svn merge -c 1829513 ^/httpd/httpd/trunk . +1: jorton, PATCHES/ISSUES THAT ARE BEING WORKED