From: Jim Jagielski <jim@apache.org>
Date: Wed, 16 Sep 2015 13:31:45 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.4.17~130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0b7feb834baa215202685a4a1031896601ca20e;p=thirdparty%2Fapache%2Fhttpd.git

promote


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

diff --git a/STATUS b/STATUS
index 0ae94022f31..0e7eb844403 100644
--- a/STATUS
+++ b/STATUS
@@ -109,6 +109,43 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_rewrite: Fix an harmless error spotted by sparse.
+     trunk: http://svn.apache.org/r1701545
+     2.4.x: http://people.apache.org/~jailletc36/backport_2.4_r1701545.diff
+     +1: jailletc36, ylavic, jim
+
+
+  *) mod_autoindex: Allow autoindexes to work without mod_dir or mod_mime
+     trunk: http://svn.apache.org/r1701436
+     2.4.x: trunk works
+     +1: covener, ylavic, jim
+
+  *) Easy patches - synch with trunk
+        - core: Core filters do not need mod_proxy.h
+        - core: Small speed optimization when parsing <Limit>, <LimitExcept>
+                and environment variables
+        - mod_dav: Save a few bytes in conf pool
+        - mod_proxy_http: Remove some spaces between some return statements
+                          and ';' + fix a strange formating in a 'for' loop
+        - mod_dav: Save a few cycles
+        - mod_deflate: Constify + save a few bytes in conf pool
+     trunk patch:
+        http://svn.apache.org/r1602978
+        http://svn.apache.org/r1683044
+        http://svn.apache.org/r1683884
+        http://svn.apache.org/r1673368
+        http://svn.apache.org/r1701717
+        http://svn.apache.org/r1683047
+     2.4.x patch: trunk patchs work
+     +1: jailletc36, ylavic, jim
+
+  *) Easy patches - synch with trunk
+     mod_negotiation: simplify type-map body tag lookup, and be safe
+                      should it contain a NUL byte.
+     trunk: http://svn.apache.org/r1700851
+     2.4.x: trunk works
+     +1: jailletc36, ylavic, jim
+
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -270,43 +307,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: icing, jim
 
 
-  *) mod_rewrite: Fix an harmless error spotted by sparse.
-     trunk: http://svn.apache.org/r1701545
-     2.4.x: http://people.apache.org/~jailletc36/backport_2.4_r1701545.diff
-     +1: jailletc36, ylavic, jim
-
-
-  *) mod_autoindex: Allow autoindexes to work without mod_dir or mod_mime
-     trunk: http://svn.apache.org/r1701436
-     2.4.x: trunk works
-     +1: covener, ylavic, jim
-
-  *) Easy patches - synch with trunk
-        - core: Core filters do not need mod_proxy.h
-        - core: Small speed optimization when parsing <Limit>, <LimitExcept>
-                and environment variables
-        - mod_dav: Save a few bytes in conf pool
-        - mod_proxy_http: Remove some spaces between some return statements
-                          and ';' + fix a strange formating in a 'for' loop
-        - mod_dav: Save a few cycles
-        - mod_deflate: Constify + save a few bytes in conf pool
-     trunk patch:
-        http://svn.apache.org/r1602978
-        http://svn.apache.org/r1683044
-        http://svn.apache.org/r1683884
-        http://svn.apache.org/r1673368
-        http://svn.apache.org/r1701717
-        http://svn.apache.org/r1683047
-     2.4.x patch: trunk patchs work
-     +1: jailletc36, ylavic, jim
-
-  *) Easy patches - synch with trunk
-     mod_negotiation: simplify type-map body tag lookup, and be safe
-                      should it contain a NUL byte.
-     trunk: http://svn.apache.org/r1700851
-     2.4.x: trunk works
-     +1: jailletc36, ylavic, jim
-
   *) mod_slotmem_shm: Fix slots/SHM files names on restart for systems that
      can't create new (clear) slots while previous children gracefully stopping
      still use the old ones (e.g. Windows, OS2). PR 58024.