logjams--

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

diff --git a/STATUS b/STATUS
index 72b5f5fcd8b6b78d9a100d76c2b0ef78d088c225..a9050cd164497dfed705a988141ad1e18b4f6738 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -85,9 +85,16 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    * mod_authn_dbd: Export any additional columns queried in the SQL select
      into the environment with the name AUTHENTICATE_<COLUMN>. This brings
      mod_authn_dbd behaviour in line with mod_authnz_ldap.
+     This also includes an EBCDIC fix in mod_authnz_ldap.c.
      Trunk: http://svn.apache.org/viewvc?view=rev&revision=466865
             http://svn.apache.org/viewvc?view=rev&revision=571798
             http://svn.apache.org/viewvc?view=rev&revision=571804
+            http://svn.apache.org/viewvc?view=rev&revision=571838
+            http://svn.apache.org/viewvc?view=rev&revision=586765
+     2.2.x: http://people.apache.org/~trawick/dbd-consolidated.txt
+     +1: trawick
+     Old commentary before 571838 and 586765 were added and conflicts
+     were resolved:
      +1: minfrin
      rpluem says: r466865 has a conflict in modules/aaa/mod_auth.h
                   r571804 has a conflict in docs/manual/mod/mod_authnz_ldap.xml