]> granicus.if.org Git - apache/commitdiff
Vote, promote.
authorRainer Jung <rjung@apache.org>
Thu, 15 Mar 2018 23:08:35 +0000 (23:08 +0000)
committerRainer Jung <rjung@apache.org>
Thu, 15 Mar 2018 23:08:35 +0000 (23:08 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1826893 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index c8ed5ffd72987908f23db151c3de67dc89afdb50..f6c6a9a89551eb3bbf6661509d0c5d00e5d2664e 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -140,6 +140,21 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1666415,1780308 ^/httpd/httpd/trunk .
      +1: rjung, covener, ylavic
 
+  *) mod_slotmem_shm: Fix failure to create balancers's slotmems in Windows MPM,
+     where children processes need to attach them instead since they are owned
+     by the parent process already.
+     trunk patch: http://svn.apache.org/r1826845
+     2.4.x patch: svn merge -c 1826845 ^/httpd/httpd/trunk .
+                  (modulo CHANGES)
+     +1: ylavic, covener, rjung
+
+  *) core: Fix request timeout logging and possible crash for error_log hooks.
+     trunk patch: http://svn.apache.org/r1826556
+                  http://svn.apache.org/r1826847
+     2.4.x patch: svn merge -c 1826556,1826847 ^/httpd/httpd/trunk .
+                  (modulo CHANGES)
+     +1: ylavic, covener, rjung
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -187,21 +202,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: rjung
      ylavic: likewise, patch not found
 
-  *) mod_slotmem_shm: Fix failure to create balancers's slotmems in Windows MPM,
-     where children processes need to attach them instead since they are owned
-     by the parent process already.
-     trunk patch: http://svn.apache.org/r1826845
-     2.4.x patch: svn merge -c 1826845 ^/httpd/httpd/trunk .
-                  (modulo CHANGES)
-     +1: ylavic, covener
-
-  *) core: Fix request timeout logging and possible crash for error_log hooks.
-     trunk patch: http://svn.apache.org/r1826556
-                  http://svn.apache.org/r1826847
-     2.4.x patch: svn merge -c 1826556,1826847 ^/httpd/httpd/trunk .
-                  (modulo CHANGES)
-     +1: ylavic, covener
-
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]