Commit 6190c02c authored by Yann Ylavic's avatar Yann Ylavic
Browse files

Backported in r1832495.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1832496 13f79535-47bb-0310-9956-ffa450edef68
parent 2743d1b7
Loading
Loading
Loading
Loading
+0 −6
Original line number Diff line number Diff line
@@ -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 ]