promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1883532 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index d4b14d8dfb8d31fde8380f8c649fdc398ea8e292..03c97014221ad46c6193be6e775c3b4cf0b91613 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -161,6 +161,35 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     Backport version for 2.4.x of patch:
      +1: jailletc36, giovanni, ylavic
 
+  *) mpm_event: reset listener_is_wakeable on reload.
+     trunk patch: http://svn.apache.org/r1877552
+     2.4.x patch: svn merge -c 1877552 ^/httpd/httpd/trunk .
+     +1: ylavic, jorton, jim
+
+  *) mod_rewrite: Extend the [CO] (cookie) flag of RewriteRule to accept a
+     SameSite attribute.
+     Trunk version of patch:
+        https://svn.apache.org/r1873762
+        https://svn.apache.org/r1881263
+     Backport version for 2.4.x of patch:
+      Trunk version of patch works
+      svn merge -c 1873762,1881263 ^/httpd/httpd/trunk .
+     +1: rpluem, gbechis, jim
+
+  *) mpm_event: kill connections in keepalive state only when there is no more
+     workers available, not when the maximum number of connections is reached,
+     restoring prior to 2.4.30 behaviour.
+     trunk patch: http://svn.apache.org/r1883096
+     2.4.x patch: svn merge -c 1883096 ^/httpd/httpd/trunk .
+     +1: ylavic, jorton, jim
+
+  *) mpm_event: don't reset connections after lingering close, restoring prior
+     to 2.4.28 behaviour.
+     trunk patch: http://svn.apache.org/r1883097
+     2.4.x patch: svn merge -c 1883097 ^/httpd/httpd/trunk .
+     +1: ylavic, jorton, jim
+
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -214,21 +243,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-dav-functions2.patch
     +1: minfrin
 
-  *) mpm_event: reset listener_is_wakeable on reload.
-     trunk patch: http://svn.apache.org/r1877552
-     2.4.x patch: svn merge -c 1877552 ^/httpd/httpd/trunk .
-     +1: ylavic, jorton, jim
-
-  *) mod_rewrite: Extend the [CO] (cookie) flag of RewriteRule to accept a
-     SameSite attribute.
-     Trunk version of patch:
-        https://svn.apache.org/r1873762
-        https://svn.apache.org/r1881263
-     Backport version for 2.4.x of patch:
-      Trunk version of patch works
-      svn merge -c 1873762,1881263 ^/httpd/httpd/trunk .
-     +1: rpluem, gbechis, jim
-
   *) Fix some Windows 64 compilation warnings (if I get positive feedbacks
      on such patches, I'll try to group more changes in future commits. However
      fixing these warnings looks like a long and boring task)
@@ -247,19 +261,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         http://svn.apache.org/r1881590
         http://svn.apache.org/r1881624
 
-  *) mpm_event: kill connections in keepalive state only when there is no more
-     workers available, not when the maximum number of connections is reached,
-     restoring prior to 2.4.30 behaviour.
-     trunk patch: http://svn.apache.org/r1883096
-     2.4.x patch: svn merge -c 1883096 ^/httpd/httpd/trunk .
-     +1: ylavic, jorton, jim
-
-  *) mpm_event: don't reset connections after lingering close, restoring prior
-     to 2.4.28 behaviour.
-     trunk patch: http://svn.apache.org/r1883097
-     2.4.x patch: svn merge -c 1883097 ^/httpd/httpd/trunk .
-     +1: ylavic, jorton, jim
-
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]