From: Rainer Jung <rjung@apache.org>
Date: Tue, 19 Jun 2018 22:50:31 +0000 (+0000)
Subject: Vote and promote.
X-Git-Tag: 2.4.34~89
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=808a94828cb5fbb063db89b1fb885a75764eafd7;p=apache

Vote and promote.


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

diff --git a/STATUS b/STATUS
index 365308fce2..48c630b92f 100644
--- a/STATUS
+++ b/STATUS
@@ -141,6 +141,13 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) log: add server_rec to some log.c fatal startup errors so they aren't
+          lost when using syslog. 
+     trunk patch: http://svn.apache.org/r1833827 
+     2.4.x patch: trunk works (needs CHANGES in 2.4)
+                  svn merge -c 1833827 ^/httpd/httpd/trunk . 
+     +1: covener, jim, rjung
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -197,13 +204,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      now useless.  They could be axed, but maybe, not in 2.4.x (even if I
      don't imagine any 3rd party proxy module to use it)
 
-  *) log: add server_rec to some log.c fatal startup errors so they aren't
-          lost when using syslog. 
-     trunk patch: http://svn.apache.org/r1833827 
-     2.4.x patch: trunk works (needs CHANGES in 2.4)
-                  svn merge -c 1833827 ^/httpd/httpd/trunk . 
-     +1: covener, jim
-
   *) mod_cache: Handle case of invalid Expires header RFC compliant
                 like the case of an Expires time in the past.
                 So allow to overwrite the non-caching decision