Commit 6102a851 authored by Joe Orton's avatar Joe Orton
Browse files

Merged x2.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1855919 13f79535-47bb-0310-9956-ffa450edef68
parent 0dcd178c
Loading
Loading
Loading
Loading
+0 −13
Original line number Diff line number Diff line
@@ -126,19 +126,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
  [ start all new proposals below, under PATCHES PROPOSED. ]

  *) mod_proxy/ssl: Cleanup per-request SSL configuration anytime a backend
     connection is recycled/reused to avoid a possible crash with some SSLProxy
     configurations in <Location> or <Proxy> context. PR 63256.
     trunk patch: http://svn.apache.org/r1855646
                  http://svn.apache.org/r1855748
     2.4.x patch svn merge -c 1855646,1855748 ^/httpd/httpd/trunk .
     +1: ylavic, jorton, jim

  *) mod_ssl: Fix restoring SSL state for TLSv1.3 PHA client cert verification.
     trunk patch: http://svn.apache.org/1855849
     2.4.x patch: svn merge -c 1855849 ^/httpd/httpd/trunk .
     +1: jorton, covener, jim


PATCHES PROPOSED TO BACKPORT FROM TRUNK:
  [ New proposals should be added at the end of the list ]