From: Stefan Fritsch <sf@apache.org>
Date: Wed, 5 Oct 2011 21:25:58 +0000 (+0000)
Subject: Export ap_max_mem_free, needed by r1178079, as pointed out by Gregg L. Smith
X-Git-Tag: 2.3.15~170
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6327f51ed2d5faeecf1158f267cc6ce11f40293e;p=apache

Export ap_max_mem_free, needed by r1178079, as pointed out by Gregg L. Smith


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1179448 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 7a0f04943f..7fc018ca6b 100644
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -355,6 +355,7 @@
  * 20110724.8 (2.3.15-dev) add ap_abort_on_oom(), ap_malloc(), ap_calloc(),
  *                         ap_realloc()
  * 20110724.9 (2.3.15-dev) add ap_varbuf_pdup() and ap_varbuf_regsub()
+ * 20110724.10(2.3.15-dev) Export ap_max_mem_free
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
@@ -362,7 +363,7 @@
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
 #define MODULE_MAGIC_NUMBER_MAJOR 20110724
 #endif
-#define MODULE_MAGIC_NUMBER_MINOR 9                    /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 10                   /* 0...n */
 
 /**
  * Determine if the server's current MODULE_MAGIC_NUMBER is at least a
diff --git a/include/mpm_common.h b/include/mpm_common.h
index 286b388e3e..7118351c30 100644
--- a/include/mpm_common.h
+++ b/include/mpm_common.h
@@ -314,7 +314,7 @@ AP_INIT_TAKE1("GracefulShutdownTimeout", ap_mpm_set_graceful_shutdown, NULL, \
 int ap_signal_server(int *, apr_pool_t *);
 void ap_mpm_rewrite_args(process_rec *);
 
-extern apr_uint32_t ap_max_mem_free;
+AP_DECLARE_DATA apr_uint32_t ap_max_mem_free;
 extern const char *ap_mpm_set_max_mem_free(cmd_parms *cmd, void *dummy,
                                            const char *arg);
 
diff --git a/server/mpm_common.c b/server/mpm_common.c
index 581e9a8288..f04ac18176 100644
--- a/server/mpm_common.c
+++ b/server/mpm_common.c
@@ -142,7 +142,7 @@ int ap_max_requests_per_child;
 char ap_coredump_dir[MAX_STRING_LEN];
 int ap_coredumpdir_configured;
 int ap_graceful_shutdown_timeout;
-apr_uint32_t ap_max_mem_free;
+AP_DECLARE_DATA apr_uint32_t ap_max_mem_free;
 apr_size_t ap_thread_stacksize;
 
 /* Set defaults for config directives implemented here.  This is