]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
* Vote and promote [skip ci]
authorRuediger Pluem <rpluem@apache.org>
Mon, 25 May 2020 08:12:22 +0000 (08:12 +0000)
committerRuediger Pluem <rpluem@apache.org>
Mon, 25 May 2020 08:12:22 +0000 (08:12 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1878094 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 1bbf072d0b63a966ab7695e748f89f715828d272..4e936bbe35f06a68f0903378e8e3808ba39a04ca 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -142,6 +142,13 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1876616 ^/httpd/httpd/trunk .
      +1: steffenal, rpluem, gbechis, jim
 
+  *) mod_http2: Fixed a regression that caused connections to close early
+     when mod_reqtimeout was configured with a handshake timeout. Fixes
+     <https://github.com/icing/mod_h2/issues/196>. [Stefan Eissing]
+     trunk patch:
+       - http://svn.apache.org/r1877783
+     2.4.x patch: svn merge -c 1877783 ^/httpd/httpd/trunk .
+     +1: icing, steffenal, rpluem
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -171,21 +178,13 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1876548 ^/httpd/httpd/trunk .
      +1: gbechis, jorton
 
-  *) mod_http2: Fixed a regression that caused connections to close early
-     when mod_reqtimeout was configured with a handshake timeout. Fixes
-     <https://github.com/icing/mod_h2/issues/196>. [Stefan Eissing]
-     trunk patch:
-       - http://svn.apache.org/r1877783
-     2.4.x patch: svn merge -c 1877783 ^/httpd/httpd/trunk .
-     +1: icing, steffenal
-
   *) mod_proxy_fcgi: Don't unset when condition is false. PR64365
      trunk patch: 
         - http://svn.apache.org/r1877829
         - http://svn.apache.org/r1877830
      2.4.x patch: svn merge -c 1877829,1877830 ^/httpd/httpd/trunk .
     +1: covener
+
    *) Easy patches: synch 2.4.x and trunk
         - core: Re-introduce check for sufficient PCRE version.
         - core: Fix doc string for QualifyRedirectURL