From: Hank Ibell <hwibell@apache.org>
Date: Wed, 5 Dec 2018 20:00:26 +0000 (+0000)
Subject: Propose
X-Git-Tag: 2.4.38~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a08e6420605aefc9f1a956a66938be5be5e6fd4;p=thirdparty%2Fapache%2Fhttpd.git

Propose

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

diff --git a/STATUS b/STATUS
index 4865997194b..7de515cf3fa 100644
--- a/STATUS
+++ b/STATUS
@@ -204,6 +204,13 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-ap_dir_fnmatch.patch
      +1: minfrin
 
+  *) core: Fix incorrect substitution of env vars in directives containing
+           multiple env vars. In ap_resolve_env(), the string returned from
+           getenv() should be copied since the returned string may be 
+           statically allocated.
+     trunk patch: http://svn.apache.org/r1848236
+     2.4.x patch: svn merge -c 1848236 ^/httpd/httpd/trunk .
+     +1: hwibell
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]