merge r265737 from trunk.

Author: trawick
Reviewed by: colm

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

diff --git a/CHANGES b/CHANGES
index 603122c5fe39dafc789d5dfc5a6ede5c3d0fe75e..84fd56623b7e562f1bb71ec5cfe56bfaab345b7b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.1.9
 
+  *) httpd.exe/apachectl -V: display the DYNAMIC_MODULE_LIMIT setting, as
+     in 1.3.  [Jeff Trawick]
+
   *) Support dbd connection tied to conn_rec in mod_dbd [Nick Kew]
 
   *) Fix use of pools in mod_dbd [Brian J France, Nick Kew]

diff --git a/server/main.c b/server/main.c
index 980858192151bc527ab565aa9fca7eca03cfb3c6..3b0d207103fc55c786057e3e61a26572113e33e5 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -196,6 +196,8 @@ static void show_compile_settings(void)
 #endif
 #endif
 
+    printf(" -D DYNAMIC_MODULE_LIMIT=%ld\n",(long)DYNAMIC_MODULE_LIMIT);
+
 #if APR_CHARSET_EBCDIC
     printf(" -D APR_CHARSET_EBCDIC\n");
 #endif