]> granicus.if.org Git - apache/commitdiff
and promote those with 3 +1s
authorJim Jagielski <jim@apache.org>
Tue, 14 Aug 2018 12:21:52 +0000 (12:21 +0000)
committerJim Jagielski <jim@apache.org>
Tue, 14 Aug 2018 12:21:52 +0000 (12:21 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1838015 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 0cd14c34e75763540a5ee8fc0c3e6c93011ab141..08ea11fe7c6a1711a3fa4e0e715ef8e45fdc5659 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -131,6 +131,17 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      +1: jailletc36, ylavic (by inspection), covener
      jailletc36: untested, but looks straight forward enough to vote
 
+   * core: maintainer mode fix for #if AP_ENABLE_EXCEPTION_HOOK
+      trunk: http://svn.apache.org/r1809135
+      2.4.x patch: svn merge -c 1809135 ^/httpd/httpd/trunk .
+      +1: covener, rjung, jim
+
+   *) core: allow quoted paths in <IfFile>
+      trunk: http://svn.apache.org/r1797844
+      2.4.x patch: svn merge -c 1797844 ^/httpd/httpd/trunk .
+      +1: jailletc36, covener, jim
+      jailletc36: once backported, iffile.t can be enabled
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -227,17 +238,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                    (adjust CHANGES and include/ap_mmn.h)
       +1: rjung, jim
 
-   * core: maintainer mode fix for #if AP_ENABLE_EXCEPTION_HOOK
-      trunk: http://svn.apache.org/r1809135
-      2.4.x patch: svn merge -c 1809135 ^/httpd/httpd/trunk .
-      +1: covener, rjung, jim
-
-   *) core: allow quoted paths in <IfFile>
-      trunk: http://svn.apache.org/r1797844
-      2.4.x patch: svn merge -c 1797844 ^/httpd/httpd/trunk .
-      +1: jailletc36, covener, jim
-      jailletc36: once backported, iffile.t can be enabled
-
   *) Easy patches: synch 2.4.x and trunk
      - mod_ssl: Tweak logging message
      - mod_ssl: make ssl_io_data_dump respect per-conn loglevel