From: Stefan Fritsch <sf@apache.org>
Date: Sat, 23 Jul 2011 17:32:24 +0000 (+0000)
Subject: Add change log entry, bump MMN
X-Git-Tag: 2.3.14^2~30^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=refs%2Fheads%2Frevert-ap-ldap;p=apache

Add change log entry, bump MMN


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@1150173 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index b756f43f96..c2f116c5fd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.3.14
 
+  *) mod_ldap: Revert the integration of apr-ldap as ap_ldap which was done
+     in 2.3.13. [Stefan Fritsch]
+
   *) core: For '*' or '_default_' vhosts, use a wildcard address of any 
      address family, rather than IPv4 only.  [Joe Orton]
 
diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 66a4e16622..2db7bac692 100644
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -341,14 +341,15 @@
  *                         ap_expr_parse_cmd_mi() function, add ap_expr_str_*() functions,
  *                         rename AP_EXPR_FLAGS_* -> AP_EXPR_FLAG_*
  * 20110702.1 (2.3.14-dev) Add ap_scan_script_header_err*_ex functions
+ * 20110723.0 (2.3.14-dev) Revert addition of ap_ldap*
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
 
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
-#define MODULE_MAGIC_NUMBER_MAJOR 20110702
+#define MODULE_MAGIC_NUMBER_MAJOR 20110723
 #endif
-#define MODULE_MAGIC_NUMBER_MINOR 1                    /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 0                    /* 0...n */
 
 /**
  * Determine if the server's current MODULE_MAGIC_NUMBER is at least a