From: Jeff Trawick <trawick@apache.org>
Date: Wed, 7 Nov 2007 14:34:09 +0000 (+0000)
Subject: one commit to address multiple distinct issues can result in perpetual
X-Git-Tag: 2.2.7~263
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4721e729bd5217d80c63d0902329211f6e0db49;p=thirdparty%2Fapache%2Fhttpd.git

one commit to address multiple distinct issues can result in perpetual
confusion


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

diff --git a/STATUS b/STATUS
index 40c993f0040..514078bc945 100644
--- a/STATUS
+++ b/STATUS
@@ -249,17 +249,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
           space for the NUL, but they don't have related sections
           which assume a set size; this does (AP_IOBUFSIZE).
 
-   * EBCDIC fix to mod_authnz_ldap AUTHENTICATE_foo variables
-     trunk:
-       http://svn.apache.org/viewvc?view=rev&revision=571798
-     2.2.x patch:
-         Unrelated changes which either don't apply or rely on 
-         a definition in mod_auth.h have been omitted.
-       http://people.apache.org/~trawick/ldap_toupper.txt
-     +1: trawick
-     -1: niq - this is part of another backport proposal above.
-         Doesn't apply to mod_authn_dbd without the other backport.
-
    * mod_charset_lite: Don't crash when the request has no associated
      filename.
      trunk:
@@ -330,3 +319,21 @@ PATCHES/ISSUES THAT ARE STALLED
           behavior on a pattern-by-pattern basis would win my -1 to a +1,
           and solve the performance hits noted by niq on an 80/20 basis.
 
+   * EBCDIC fix to mod_authnz_ldap AUTHENTICATE_foo variables
+     trunk:
+       http://svn.apache.org/viewvc?view=rev&revision=571798
+     2.2.x patch:
+         Unrelated changes which either don't apply or rely on 
+         a definition in mod_auth.h have been omitted.
+       http://people.apache.org/~trawick/ldap_toupper.txt
+     +1: trawick
+     -1: niq - this is part of another backport proposal above.
+         Doesn't apply to mod_authn_dbd without the other backport.
+     trawick: niq is of course correct; this simple EBCDIC fix is
+       tied up in a conflict-ridden proposal above for mod_authn_dbd
+       which also references r571790.  If nobody is able to unravel that
+       backport and provide a good patch for review, I'll activate this
+       proposal and deactivate the other, and when somebody has the time to
+       offer a consolidated patch they can easily omit the several lines
+       that correct the EBDIC problem so that the two separate issues
+       can finally be addressed separately.