From: Jim Jagielski <jim@apache.org>
Date: Wed, 29 Mar 2017 17:11:19 +0000 (+0000)
Subject: prmote
X-Git-Tag: 2.4.26~197
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=20e90078e28782bf7984b01f7e0edde22e833058;p=apache

prmote



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

diff --git a/STATUS b/STATUS
index a242c39a9d..be52285775 100644
--- a/STATUS
+++ b/STATUS
@@ -118,6 +118,35 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_autoindex: Add IndexOptions UseOldDateFormat to allow the date
+     format from 2.2 in the Last Modified column. PR60846.
+     trunk patch: http://svn.apache.org/r1787525
+                  http://svn.apache.org/r1787553
+                  http://svn.apache.org/r1788451
+     2.4.x patch: trunk works
+     +1 covener, jim
+
+  *) mod_proxy: Allow the per-request environment variable "no-proxy" to
+     be used as an alternative to ProxyPass /path !. This is primarily
+     to set exceptions for ProxyPass specified in <Location> context.
+     trunk patch: http://svn.apache.org/r1781328
+                  http://svn.apache.org/r1785907
+     2.4.x patch: trunk works
+     +1: covener, ylavic, jim
+
+  *) Easy patches: synch 2.4.x and trunk
+     - cache: Use apr_pstrmemdup instead of apr_pstrndup when applicable
+     - cache: Remove a useless break + tiny style fix (missing space)
+     - vhost: save some request pool memory
+     - vhost: Fix some tiny style issues
+     - mod_dir: Save a few bytes in the request pool.
+     trunk patch: http://svn.apache.org/r1777556
+                  http://svn.apache.org/r1777557
+                  http://svn.apache.org/r1777593
+                  http://svn.apache.org/r1777594
+                  http://svn.apache.org/r1783056
+     2.4.x patch: trunk patches work
+     +1: jailletc36, ylavic, jim
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -174,36 +203,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              default value (as expected).
      jim: Committed in r1789387
 
-  *) mod_autoindex: Add IndexOptions UseOldDateFormat to allow the date
-     format from 2.2 in the Last Modified column. PR60846.
-     trunk patch: http://svn.apache.org/r1787525
-                  http://svn.apache.org/r1787553
-                  http://svn.apache.org/r1788451
-     2.4.x patch: trunk works
-     +1 covener, jim
-
-  *) mod_proxy: Allow the per-request environment variable "no-proxy" to
-     be used as an alternative to ProxyPass /path !. This is primarily
-     to set exceptions for ProxyPass specified in <Location> context.
-     trunk patch: http://svn.apache.org/r1781328
-                  http://svn.apache.org/r1785907
-     2.4.x patch: trunk works
-     +1: covener, ylavic, jim
-
-  *) Easy patches: synch 2.4.x and trunk
-     - cache: Use apr_pstrmemdup instead of apr_pstrndup when applicable
-     - cache: Remove a useless break + tiny style fix (missing space)
-     - vhost: save some request pool memory
-     - vhost: Fix some tiny style issues
-     - mod_dir: Save a few bytes in the request pool.
-     trunk patch: http://svn.apache.org/r1777556
-                  http://svn.apache.org/r1777557
-                  http://svn.apache.org/r1777593
-                  http://svn.apache.org/r1777594
-                  http://svn.apache.org/r1783056
-     2.4.x patch: trunk patches work
-     +1: jailletc36, ylavic, jim
-
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entried should be added at the START of the list ]