From: Graham Leggett <minfrin@apache.org>
Date: Sun, 27 Sep 2015 11:31:49 +0000 (+0000)
Subject: Vote and promote.
X-Git-Tag: 2.4.17~95
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f90e7483ae9d2a8ad4ccca0e7259c606a346ccd;p=thirdparty%2Fapache%2Fhttpd.git

Vote and promote.


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

diff --git a/STATUS b/STATUS
index 5b5f96ec770..8b52391ae03 100644
--- a/STATUS
+++ b/STATUS
@@ -109,6 +109,15 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   * mod_cache: r->err_headers_out is not merged into
+     r->headers when mod_cache is enabled and the response
+     is cached for the first time.
+     trunk patch: http://svn.apache.org/r1704392
+                  http://svn.apache.org/r1704395
+     2.4.x patch: trunk works
+     +1: elu, ylavic, minfrin
+     ylavic: possibly with a CHANGES entry
+
  
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -224,15 +233,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works (module CHANGES)
      +1: ylavic, minfrin
 
-   * mod_cache: r->err_headers_out is not merged into
-     r->headers when mod_cache is enabled and the response
-     is cached for the first time.
-     trunk patch: http://svn.apache.org/r1704392
-                  http://svn.apache.org/r1704395
-     2.4.x patch: trunk works
-     +1: elu, ylavic
-     ylavic: possibly with a CHANGES entry
-
    *) mod_logio: Fix %^FB on initial request on SSL connection by not counting
       handshake writes as first byte. Also fix processing per Yann's observations
       about potential problems with e.g. write completion.