From: William A. Rowe Jr <wrowe@apache.org>
Date: Fri, 21 Jun 2013 15:17:31 +0000 (+0000)
Subject: Condense
X-Git-Tag: 2.2.25~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba6227ad284a2c9f5ea515d2b6a1de8c6410ae34;p=thirdparty%2Fapache%2Fhttpd.git

Condense

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

diff --git a/STATUS b/STATUS
index 7eabfbc7910..7d8a11fc34a 100644
--- a/STATUS
+++ b/STATUS
@@ -104,14 +104,7 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.2.x patch: http://people.apache.org/~druggeri/patches/AuthLDAPBindPasswordExec-2.2.patch
                   (20130119 - updated to include minor mmn bump)
                   (20130412 - updated to not use static var - thx, wrowe)
-     +1: druggeri
-     -1: wrowe (switch to +1 once ap_get_exec_line is made thread-safe, right
-               now it uses a static which is verboten in reentrant code.)
-               kudos for using apr_tokenize_to_argv to allow spaces in args.
-               druggeri: This was updated in trunk 1467523/1467792. The 2.2. patch now reflects
-                         the same.
-     +1: minfrin (including fix for wrowe's issue above)
-     minfrin: wrowe's -1 switches to +1 as above
+     +1: druggeri, minfrin. wrowe
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK: