]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
* Vote and promote
authorRuediger Pluem <rpluem@apache.org>
Tue, 15 Jan 2019 12:59:44 +0000 (12:59 +0000)
committerRuediger Pluem <rpluem@apache.org>
Tue, 15 Jan 2019 12:59:44 +0000 (12:59 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1851345 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index d375fd05dd06dc3cc6d399430ebaf705aad16374..0c9c87a1c7cefa59ca1062b67d0104d2ca6512fd 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -131,6 +131,12 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1850947 ^/httpd/httpd/trunk .
      +1: hwibell, covener, wrowe
 
+  *) mod_ssl (ssl_engine_io.c: bio_filter_out_write, bio_filter_in_read)
+     Clear retry flags before aborting on client-initiated reneg. [Joe Orton]
+     PR: 63052
+     trunk patch: http://svn.apache.org/r1850946
+     2.4.x patch: svn merge -c 1850946 ^/httpd/httpd/trunk .
+     +1: wrowe, jorton, rpluem
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -232,13 +238,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1850834,1850835 ^/httpd/httpd/trunk .
      +1: jailletc36
 
-  *) mod_ssl (ssl_engine_io.c: bio_filter_out_write, bio_filter_in_read)
-     Clear retry flags before aborting on client-initiated reneg. [Joe Orton]
-     PR: 63052
-     trunk patch: http://svn.apache.org/r1850946
-     2.4.x patch: svn merge -c 1850946 ^/httpd/httpd/trunk .
-     +1: wrowe, jorton
-
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]