From: Graham Leggett <minfrin@apache.org>
Date: Wed, 1 Jan 2020 19:18:57 +0000 (+0000)
Subject: Update proposal.
X-Git-Tag: 2.4.42~179
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=79184a0b653d8cbe0b7d6fb788a975fe2187820a;p=thirdparty%2Fapache%2Fhttpd.git

Update proposal.


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

diff --git a/STATUS b/STATUS
index c6ad374dfd1..c7efa137076 100644
--- a/STATUS
+++ b/STATUS
@@ -287,7 +287,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      other than its target location, add that prefix to includes and library directories.
      Without this, apxs would fail to find config_vars.mk and exit.
      trunk patch: http://svn.apache.org/r1872042
-     2.4.x patch: svn merge -c 1872042 ^/httpd/httpd/trunk
+                  http://svn.apache.org/r1872062
+     2.4.x patch: svn merge -c 1872042,1872062 ^/httpd/httpd/trunk
      +1: minfrin