From: Yann Ylavic <ylavic@apache.org>
Date: Sat, 28 Oct 2017 16:11:23 +0000 (+0000)
Subject: Propose.
X-Git-Tag: 2.4.30~291
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f2844c00e3b600a65748a27f4440dc0372c3405;p=apache

Propose.

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

diff --git a/STATUS b/STATUS
index 8653d9d14e..bd85f2f5b0 100644
--- a/STATUS
+++ b/STATUS
@@ -213,6 +213,14 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x: svn merge -c 1811744 ^/httpd/httpd/trunk .
      +1: elukey
 
+  *) mod_macro: fix usability of globally defined macros in .htaccess files.
+                PR 57525.
+     trunk patch: http://svn.apache.org/r1813643
+     2.4.x patch: trunk works (modulo CHANGES)
+                  svn merge -c 1813643 ^/httpd/httpd/trunk .
+     +1: ylavic
+
+
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]