2 small backports.

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

diff --git a/STATUS b/STATUS
index ed7cafeb7441a5c08b0049a670752f815284f5f1..567bfca1ae1e85f91f00751050157ffb2ede4053 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -210,6 +210,17 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c r1921805 ^/httpd/httpd/trunk .
      +1: icing
 
+  *) mod_authnz_ldap: Fix attribute allocation size.
+     trunk patch: https://svn.apache.org/r1921971
+     2.4.x patch: svn merge -c 1921971 ^/httpd/httpd/trunk .
+     +1: jorton,
+     
+  *) mod_log_config: Fix LogFormat directive merging
+     trunk patch: https://svn.apache.org/r1921305
+                  https://svn.apache.org/r1921306
+     2.4.x patch: svn merge -c 1921305,1921306 ^/httpd/httpd/trunk .
+     +1: jorton,
+
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]