From: Jim Jagielski <jim@apache.org>
Date: Thu, 26 Apr 2018 17:34:01 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.4.34~187
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32e4e2df37148a7c3afb26c53f830b7f6c180b56;p=apache

promote


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

diff --git a/STATUS b/STATUS
index 12185bb993..b0918860eb 100644
--- a/STATUS
+++ b/STATUS
@@ -132,6 +132,11 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) core: restore r->method after internal redirect to errordocument so %<m
+     can be logged. PR62186
+     trunk patch: https://svn.apache.org/r1828920
+     2.4.x patch: svn merge -c 1828920 ^/httpd/httpd/trunk .
+     +1: covener, jhriggs, jim
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -243,12 +248,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/hot-spare-2.4.patch
      +1: jhriggs, jim
 
-  *) core: restore r->method after internal redirect to errordocument so %<m
-     can be logged. PR62186
-     trunk patch: https://svn.apache.org/r1828920
-     2.4.x patch: svn merge -c 1828920 ^/httpd/httpd/trunk .
-     +1: covener, jhriggs, jim
-
   *) core: use strncmp in check_errorlog_dir and core_dump_config when checking
      if the ErrorLog directive is configured with the 'syslog' prefix. PR 62102
      trunk patch: none, as far as I can see the code in trunk diverged too much