Commit ad1a1ca6 authored by Eric Covener's avatar Eric Covener
Browse files

vote/promote



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1843367 13f79535-47bb-0310-9956-ffa450edef68
parent 446d80b5
Loading
Loading
Loading
Loading
+8 −8
Original line number Diff line number Diff line
@@ -143,6 +143,14 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     (requires r1738415 and r1826930 above to resolve conflict)
     +1: minfrin, jim, ylavic

  *) mod_ssl: Fix a regression that the configuration settings for verify mode
     and verify depth were taken from the frontend connection in case of
     connections by the proxy to the backend. PR 62769.
     trunk patch: http://svn.apache.org/r1842540
     2.4.x: trunk works (modulo CHANGES)
            svn merge -c r1842540 ^/httpd/httpd/trunk .
     +1: ylavic, icing (by inspection), covener


PATCHES PROPOSED TO BACKPORT FROM TRUNK:
  [ New proposals should be added at the end of the list ]
@@ -194,14 +202,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: http://home.apache.org/~jim/patches/socache_redisv2.patch
      +1: jim, minfrin

  *) mod_ssl: Fix a regression that the configuration settings for verify mode
     and verify depth were taken from the frontend connection in case of
     connections by the proxy to the backend. PR 62769.
     trunk patch: http://svn.apache.org/r1842540
     2.4.x: trunk works (modulo CHANGES)
            svn merge -c r1842540 ^/httpd/httpd/trunk .
     +1: ylavic, icing (by inspection)

  *) mod_brotli, mod_deflate: Restore the separate handling of 304 Not Modified
     responses allowing these modules to properly set or fix-up the response
     headers such as Vary or ETag. Fixes a potential violation of RFC7232, 4.1.