summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Fritsch <sf@apache.org>2011-07-23 17:32:24 +0000
committerStefan Fritsch <sf@apache.org>2011-07-23 17:32:24 +0000
commit068a678142647573f5e338dedbce91b8fa545096 (patch)
tree35158816e99b2e16fd09a72c42ede85f043b1d4c
parent602791140b032e069c1541c158d5100b738db16c (diff)
downloadhttpd-revert-ap-ldap.tar.gz
Add change log entry, bump MMNrevert-ap-ldap
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@1150173 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--CHANGES3
-rw-r--r--include/ap_mmn.h5
2 files changed, 6 insertions, 2 deletions
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