From: Graham Leggett <minfrin@apache.org>
Date: Sun, 24 Feb 2019 13:36:12 +0000 (+0000)
Subject: Update proposal.
X-Git-Tag: 2.4.39~81
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af6003670b974f05e194679974a744ad1acd0638;p=thirdparty%2Fapache%2Fhttpd.git

Update proposal.


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

diff --git a/STATUS b/STATUS
index 67074d58927..cb575ef27d7 100644
--- a/STATUS
+++ b/STATUS
@@ -179,9 +179,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      from the Include/IncludeOptional directives into a generic set of
      functions ap_dir_nofnmatch() and ap_dir_fnmatch().
      trunk patch: http://svn.apache.org/r1847430
-     2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-ap_dir_fnmatch.patch
-     +1: minfrin, jim
+                  http://svn.apache.org/r1853302
+     2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-ap_dir_fnmatch-2.patch
+     +1: minfrin
      jailletc36: at least, r1853302 is required, IMHO
+     minfrin: r1853302 is added in above, resetting jim's vote
 
   *) mod_log_config: Support %{c}h for conn-hostname, %h for useragent_host
      PR 55348