From: Graham Leggett <minfrin@apache.org>
Date: Mon, 1 Mar 2010 21:52:09 +0000 (+0000)
Subject: Update proposal.
X-Git-Tag: 2.2.15~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87058294befb1e39de108f562d23375351ace32d;p=thirdparty%2Fapache%2Fhttpd.git

Update proposal.


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

diff --git a/STATUS b/STATUS
index c36a0f4d494..98b3593deb9 100644
--- a/STATUS
+++ b/STATUS
@@ -116,7 +116,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   * core: Support wildcards in both the directory and file components of
     the path specified by the Include directive.
     Trunk patch: http://svn.apache.org/viewvc?rev=909878&view=rev
-    2.2.x patch: http://people.apache.org/~minfrin/httpd-wildcard+docs.patch
+                 http://svn.apache.org/viewvc?rev=917735&view=rev
+    2.2.x patch: http://people.apache.org/~minfrin/httpd-wildcard+docs2.patch
+    Submitted by: minfrin, poirier
     +1: minfrin
 
   * support/htcacheclean: Teach it how to write a pid file (modelled on