Commit 19988bcf authored by Jim Jagielski's avatar Jim Jagielski
Browse files

promote


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1832608 13f79535-47bb-0310-9956-ffa450edef68
parent 0e0f6f48
Loading
Loading
Loading
Loading
+8 −8
Original line number Diff line number Diff line
@@ -155,6 +155,14 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     jailletc36: There should be a compatibility note for the new directives.
                 (done in r1828478)

  *) mod_proxy_balancer: Add hot spare member type and corresponding flag (R). Hot spare members are
     used as drop-in replacements for unusable workers in the same load balancer set. This differs
     from hot standbys which are only used when all workers in a set are unusable. PR 61140.
     trunk patch: https://svn.apache.org/r1828890
     2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/hot-spare-2.4.patch
     +1: jhriggs, jim
     ylavic: +1 with r1832500.


PATCHES PROPOSED TO BACKPORT FROM TRUNK:
  [ New proposals should be added at the end of the list ]
@@ -193,14 +201,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/ssl-policy.patch
     +1: icing

  *) mod_proxy_balancer: Add hot spare member type and corresponding flag (R). Hot spare members are
     used as drop-in replacements for unusable workers in the same load balancer set. This differs
     from hot standbys which are only used when all workers in a set are unusable. PR 61140.
     trunk patch: https://svn.apache.org/r1828890
     2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/hot-spare-2.4.patch
     +1: jhriggs, jim
     ylavic: +1 with r1832500.

  *) ap_rgetline()+mod_proxy_http: Add and handle AP_GETLINE_NOSPC_EOL flag,
     fixes responses header thrown away on APR_ENOSPC, and allow their size to
     be configured (ResponseFieldSize). PRs 62196, 62198 and 62199.