]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
vote/promote
authorEric Covener <covener@apache.org>
Mon, 18 Mar 2019 12:03:10 +0000 (12:03 +0000)
committerEric Covener <covener@apache.org>
Mon, 18 Mar 2019 12:03:10 +0000 (12:03 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1855749 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 4189ed209db8cefee35d8c3405e5c8ccdd1c1a36..ddecc95e1ebb9e4cd4da18ab5365d638c0eccc0d 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -146,6 +146,10 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      +1: jim, ylavic, covener
      jailletc36: require r1818321 and part of r1818341 to update doc accordingly
 
+  *) core: fix SEGFAULT in CONNECT with recent change
+     2.4.x: svn merge -c 1855743,1855744 ^/httpd/httpd/trunk .
+     +1: rpluem, icing, covener
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -231,11 +235,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              possible. Changes from v3 to v4 (r1853953 mainly, r1853956 is only
              comment) are non functional (or at least intended as such).
 
-  *) core: fix SEGFAULT in CONNECT with recent change
-     2.4.x: svn merge -c 1855743,1855744 ^/httpd/httpd/trunk .
-     +1: rpluem, icing, 
-
-
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]