From: Joe Orton <jorton@apache.org>
Date: Thu, 19 Apr 2018 08:04:31 +0000 (+0000)
Subject: 100% guarantee no regressions in this patch or your money back.
X-Git-Tag: 2.4.34~201
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e0b0383e148a038e0b95b10b100349c2dea0d6c3;p=apache

100% guarantee no regressions in this patch or your money back.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1829514 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 16cd5c2af1..25d80ed73a 100644
--- a/STATUS
+++ b/STATUS
@@ -247,6 +247,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: elukey
      jhriggs: See https://lists.apache.org/thread.html/204866da0fd06a1ec8a8819c33955b6d0234f135702a100af9d764cc@%3Cdev.httpd.apache.org%3E
 
+  *) 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 .
+     +1: jorton,
+
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]