Commit 3c58ba77 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@1722161 13f79535-47bb-0310-9956-ffa450edef68
parent ca1d9287
Loading
Loading
Loading
Loading
+20 −21
Original line number Diff line number Diff line
@@ -117,6 +117,25 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     +1: ylavic, mrumph, wrowe
     mrumph: Bug 58737 was also opened for this error.

  *) Remove some useless return statements (+ some minor style changes)
     trunk patch: http://svn.apache.org/r1715567
                  http://svn.apache.org/r1715568
                  http://svn.apache.org/r1715570
                  http://svn.apache.org/r1715571
                  http://svn.apache.org/r1715572
                  http://svn.apache.org/r1715576
                  http://svn.apache.org/r1715581
                  http://svn.apache.org/r1715582
                  http://svn.apache.org/r1715583
                  http://svn.apache.org/r1715584
                  http://svn.apache.org/r1715585
     2.4.x patch: https://people.apache.org/~jailletc36/remove_return.patch
     +1: jailletc36, jim, covener

  *) mod_ssl: Fix "warning: variable 'hssc' set but not used".
              2.4.x only, r1715255 merged in 2.4.18 missed this (trunk) hunk.
     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-ssl_hssc_warning.patch
     +1: ylavic, rpluem, covener

PATCHES PROPOSED TO BACKPORT FROM TRUNK:
  [ New proposals should be added at the end of the list ]
@@ -144,21 +163,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     ylavic: Also, I don't think the changes on worker/event are needed,
             prefork only requires the accept mutex in ONE_PROCESS mode.

  *) Remove some useless return statements (+ some minor style changes)
     trunk patch: http://svn.apache.org/r1715567
                  http://svn.apache.org/r1715568
                  http://svn.apache.org/r1715570
                  http://svn.apache.org/r1715571
                  http://svn.apache.org/r1715572
                  http://svn.apache.org/r1715576
                  http://svn.apache.org/r1715581
                  http://svn.apache.org/r1715582
                  http://svn.apache.org/r1715583
                  http://svn.apache.org/r1715584
                  http://svn.apache.org/r1715585
     2.4.x patch: https://people.apache.org/~jailletc36/remove_return.patch
     +1: jailletc36, jim

  *) mod_ssl: Fix missing TLS Upgrade/Connection headers on OPTIONS * requests
     (Note that this is simply a necessary band-aid, and still won't allow h2c
     to peacefully coexist with tls/n.n upgrades, because Upgrade phase needs
@@ -177,11 +181,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.4.x patch: http://jkaluza.fedorapeople.org/httpd-2.4.x-dhparams-free.patch
     +1: jkaluza

  *) mod_ssl: Fix "warning: variable 'hssc' set but not used".
              2.4.x only, r1715255 merged in 2.4.18 missed this (trunk) hunk.
     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-ssl_hssc_warning.patch
     +1: ylavic, rpluem

  *) mod_cache_socache: Fix a possible cached entity body corruption when it
     is received from an origin server in multiple batches and forwarded by
     mod_proxy.
@@ -192,7 +191,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
  *) mod_proxy: Prevent invalid loadfactor value from being updated
     trunk patch: http://svn.apache.org/r1722137
     2.4.x patch: trunk works
     +1: jim
     +1: jim, covener

  *) mod_log_config: PR58769: backport GlobalLog directive to 2.4.x
     trunk patch: http://svn.apache.org/r1599535