Commit 7065098b authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

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
parent 163289ae

include/ap_mmn.h

+2 −1
Original line number Diff line number Diff line
@@ -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

include/mpm_common.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

server/mpm_common.c

+1 −1
Original line number Diff line number Diff line
@@ -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