From: Rainer Jung <rjung@apache.org>
Date: Mon, 19 Jan 2015 09:50:05 +0000 (+0000)
Subject: Remove "accepted" background proposal that
X-Git-Tag: 2.4.12~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=138ceacf53f96d5597fd8aee78363650cbe3f5c7;p=thirdparty%2Fapache%2Fhttpd.git

Remove "accepted" background proposal that
was added back by reverting its commit
(PR 41867, DirectoryMatch).

Add another proposal.


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

diff --git a/STATUS b/STATUS
index 54159c8dd75..836f9037a73 100644
--- a/STATUS
+++ b/STATUS
@@ -105,11 +105,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * core: Do not match files when using DirectoryMatch. PR 41867.
-     trunk patch: http://svn.apache.org/r1635428
-     2.4.x patch: http://people.apache.org/~jkaluza/patches/httpd-2.4.x-directorymatch.patch
-     +1: jkaluza, covener, ylavic
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -229,6 +224,14 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunks works (modulo CHANGES)
      +1: ylavic
 
+   * mod_authnz_fcgi.c: Silence compiler warnings:
+         - modules/aaa/mod_authnz_fcgi.c:705: warning:
+           'orspbuflen' may be used uninitialized in this function
+         - modules/aaa/mod_authnz_fcgi.c:1235: warning:
+           comparison is always false due to limited range of data type
+     trunk patch: http://svn.apache.org/r1652829
+     2.4.x patch: trunk works
+     +1: rjung
 
 OTHER PROPOSALS