From: Rainer Jung <rjung@apache.org>
Date: Tue, 6 Aug 2019 20:03:16 +0000 (+0000)
Subject: Propose.
X-Git-Tag: 2.4.41~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=763940a69075dd160ade5dac5ee108474d983ebe;p=thirdparty%2Fapache%2Fhttpd.git

Propose.


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

diff --git a/STATUS b/STATUS
index 91d486ac879..1579aa6f1f9 100644
--- a/STATUS
+++ b/STATUS
@@ -155,6 +155,22 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1864526 ^/httpd/httpd/trunk .
      +1: jorton, covener, 
 
+  *) apr_common.m4: Pick up from APR 1.7.0.
+     apr_common.m4 is currently from APR 1.6.x. When running buildconf
+     against APR 1.7.x it gets updated from there. Therefore in the
+     apr_common.m4 in the 2.4.40 tarball differs from the one in svn for 2.4.x
+     (a copy of the APR 1.6.x version in svn, a copy of the APR 1.7.x version
+     in the tarball).
+     The below backports the changes to apr_common.m4 in httpd trunk which
+     in effect result in the 2.4.x apr_common.m4 to become identical with
+     the one in APR 1.7.x (and trunk).
+     trunk patch: http://svn.apache.org/r1856560
+                  http://svn.apache.org/r1856561
+                  http://svn.apache.org/r1856846
+     2.4.x patch: svn merge -c 1856560,1856561,1856846 ^/httpd/httpd/trunk .
+     +1: rjung
+
+
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]