From: Graham Leggett <minfrin@apache.org>
Date: Sat, 26 Sep 2015 22:54:42 +0000 (+0000)
Subject: Vote and promote.
X-Git-Tag: 2.4.17~98
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=462949326badb4648eef52fa072690f4fdd710ec;p=apache

Vote and promote.


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

diff --git a/STATUS b/STATUS
index 8e6c179a03..24b16ff105 100644
--- a/STATUS
+++ b/STATUS
@@ -109,6 +109,21 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_slotmem_shm: Fix slots/SHM files names on restart for systems that
+     can't create new (clear) slots while previous children gracefully stopping
+     still use the old ones (e.g. Windows, OS2). PR 58024.
+     trunk patch: http://svn.apache.org/r1702450
+                  http://svn.apache.org/r1702473
+                  http://svn.apache.org/r1702501
+                  http://svn.apache.org/r1702955
+                  http://svn.apache.org/r1703149
+                  http://svn.apache.org/r1703157
+                  http://svn.apache.org/r1703169
+                  http://svn.apache.org/r1703200
+     2.4.x patch: trunk works (module CHANGES)
+     merge patch: http://people.apache.org/~ylavic/httpd-2.4.x-mod_slotmem_shm-generation.patch
+     +1: ylavic, jim, minfrin
+
  
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -207,21 +222,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
          svn diff ^/httpd/httpd/branches/2.4.x ^/httpd/httpd/branches/2.4.17-protocols-http2
      +1: icing, jim
 
-  *) mod_slotmem_shm: Fix slots/SHM files names on restart for systems that
-     can't create new (clear) slots while previous children gracefully stopping
-     still use the old ones (e.g. Windows, OS2). PR 58024.
-     trunk patch: http://svn.apache.org/r1702450
-                  http://svn.apache.org/r1702473
-                  http://svn.apache.org/r1702501
-                  http://svn.apache.org/r1702955
-                  http://svn.apache.org/r1703149
-                  http://svn.apache.org/r1703157
-                  http://svn.apache.org/r1703169
-                  http://svn.apache.org/r1703200
-     2.4.x patch: trunk works (module CHANGES)
-     merge patch: http://people.apache.org/~ylavic/httpd-2.4.x-mod_slotmem_shm-generation.patch
-     +1: ylavic, jim
-
   *) mod_proxy: don't recyle backend announced "Connection: close" connections
      to avoid reusing it should the close be effective after some new request
      is ready to be sent.