From: Jim Jagielski <jim@apache.org>
Date: Tue, 11 Oct 2016 12:18:35 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.4.24~201
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30da4e4dd2ab3ca7d7ee43a4f85f5d39d110c921;p=thirdparty%2Fapache%2Fhttpd.git

promote


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

diff --git a/STATUS b/STATUS
index a2fd52f8221..04772e3dc41 100644
--- a/STATUS
+++ b/STATUS
@@ -117,6 +117,19 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_dav: Fix a potential cause of unbounded memory usage or incorrect
+     behavior in a routine that sends <DAV:response>'s to the output filters.
+     trunk patch: http://svn.apache.org/r1764040
+     2.4.x patch: trunk works (modulo CHANGES)
+     Note: this patch changes the signature of the existing mod_dav's public
+     API, dav_send_one_response(), because this API is not yet a part of any
+     2.4.x release (it was backported to 2.4.x in r1756561).  So, the change
+     should either go to the upcoming 2.4.24, or should be reworked in case
+     2.4.24 is released without it.  See the thread at
+     https://mail-archives.apache.org/mod_mbox/httpd-dev/201608.mbox/%3C20160822151917.GA22369%40redhat.com%3E
+     for additional details.
+     +1: kotkov, jorton, jim
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -209,19 +222,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                 added to CFLAGS because when combined with -Wstrict-prototypes,
                 the AC_LANG_PROGRAM won't compile (it uses a bare main()).
 
-  *) mod_dav: Fix a potential cause of unbounded memory usage or incorrect
-     behavior in a routine that sends <DAV:response>'s to the output filters.
-     trunk patch: http://svn.apache.org/r1764040
-     2.4.x patch: trunk works (modulo CHANGES)
-     Note: this patch changes the signature of the existing mod_dav's public
-     API, dav_send_one_response(), because this API is not yet a part of any
-     2.4.x release (it was backported to 2.4.x in r1756561).  So, the change
-     should either go to the upcoming 2.4.24, or should be reworked in case
-     2.4.24 is released without it.  See the thread at
-     https://mail-archives.apache.org/mod_mbox/httpd-dev/201608.mbox/%3C20160822151917.GA22369%40redhat.com%3E
-     for additional details.
-     +1: kotkov, jorton, jim
-
 PATCHES/ISSUES THAT ARE BEING WORKED
 
   *) http: Don't remove the Content-Length of zero from a HEAD response if