Commit 6780ea63 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

promotes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1757668 13f79535-47bb-0310-9956-ffa450edef68
parent 767c34d9
Loading
Loading
Loading
Loading
+19 −19
Original line number Diff line number Diff line
@@ -154,6 +154,25 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     2.4.x patch: trunk works
     +1: ylavic, sf, rpluem

  *) ab: Set the Server Name Indication (SNI) extension on outgoing TLS
     connections (unless -I is specified), according to the Host header (if
     any) or the requested URL's hostname otherwise.
     trunk patch: http://svn.apache.org/r1750854
                  http://svn.apache.org/r1750855
                  http://svn.apache.org/r1750947
                  http://svn.apache.org/r1750955
                  http://svn.apache.org/r1750960
     2.4.x patch: http://home.apache.org/~ylavic/patches/httpd-2.4.x-ab_sni.patch
                  (needed to adapt CHANGES entry since r1750854)
     +1: ylavic, covener, jim

  *) mod_reqtimeout: Fix body timeout disabling for CONNECT requests to avoid
     triggering mod_proxy_connect's AH01018 once the tunnel is established.
     trunk patch: http://svn.apache.org/r1754391
                  http://svn.apache.org/r1754399
     2.4.x patch: trunk works (module CHANGES)
     +1: ylavic, rpluem, jim

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

@@ -181,18 +200,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     headers (GMT now, GMT now Europe/Paris, GMT tomorrow, GMT yesterday).
     +1: elukey, jchampion

  *) ab: Set the Server Name Indication (SNI) extension on outgoing TLS
     connections (unless -I is specified), according to the Host header (if
     any) or the requested URL's hostname otherwise.
     trunk patch: http://svn.apache.org/r1750854
                  http://svn.apache.org/r1750855
                  http://svn.apache.org/r1750947
                  http://svn.apache.org/r1750955
                  http://svn.apache.org/r1750960
     2.4.x patch: http://home.apache.org/~ylavic/patches/httpd-2.4.x-ab_sni.patch
                  (needed to adapt CHANGES entry since r1750854)
     +1: ylavic, covener, jim

  *) CMake: fix various issues for Windows/Visual Studio build environments.
     PR59685.
     trunk patch: http://svn.apache.org/r1752331
@@ -239,13 +246,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                  http://home.apache.org/~ylavic/patches/httpd-2.4.x-r1750392.patch
     +1: ylavic

  *) mod_reqtimeout: Fix body timeout disabling for CONNECT requests to avoid
     triggering mod_proxy_connect's AH01018 once the tunnel is established.
     trunk patch: http://svn.apache.org/r1754391
                  http://svn.apache.org/r1754399
     2.4.x patch: trunk works (module CHANGES)
     +1: ylavic, rpluem, jim

  *) mod_proxy_hcheck: Add missing copy of hcuri and hcexpr ftom the worker to
     the health check worker.
     Trunk version of patch: