From 901744828a2287c5fc2bd6bbd3f1f39184ce1b98 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Thu, 26 Mar 2009 15:24:11 +0000 Subject: [PATCH] prefork, worker, event: restore expected accept mutex mechanism and allocator limit support (the related AP_MPM_WANT_foo defines no longer exist) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758680 13f79535-47bb-0310-9956-ffa450edef68 --- server/mpm/experimental/event/event.c | 2 -- server/mpm/prefork/prefork.c | 4 ---- server/mpm/worker/worker.c | 6 +----- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/server/mpm/experimental/event/event.c b/server/mpm/experimental/event/event.c index 86b655f7f7..f6b409d750 100644 --- a/server/mpm/experimental/event/event.c +++ b/server/mpm/experimental/event/event.c @@ -2407,9 +2407,7 @@ static int event_pre_config(apr_pool_t * pconf, apr_pool_t * plog, ap_lock_fname = DEFAULT_LOCKFILE; ap_max_requests_per_child = DEFAULT_MAX_REQUESTS_PER_CHILD; ap_extended_status = 0; -#ifdef AP_MPM_WANT_SET_MAX_MEM_FREE ap_max_mem_free = APR_ALLOCATOR_MAX_FREE_UNLIMITED; -#endif apr_cpystrn(ap_coredump_dir, ap_server_root, sizeof(ap_coredump_dir)); diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c index ca0f146930..f70798260b 100644 --- a/server/mpm/prefork/prefork.c +++ b/server/mpm/prefork/prefork.c @@ -1010,12 +1010,10 @@ static int prefork_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) ap_get_server_description()); ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf, "Server built: %s", ap_get_server_built()); -#ifdef AP_MPM_WANT_SET_ACCEPT_LOCK_MECH ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, "AcceptMutex: %s (default: %s)", apr_proc_mutex_name(accept_mutex), apr_proc_mutex_defname()); -#endif restart_pending = shutdown_pending = 0; mpm_state = AP_MPMQ_RUNNING; @@ -1346,9 +1344,7 @@ static int prefork_pre_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp ap_lock_fname = DEFAULT_LOCKFILE; ap_max_requests_per_child = DEFAULT_MAX_REQUESTS_PER_CHILD; ap_extended_status = 0; -#ifdef AP_MPM_WANT_SET_MAX_MEM_FREE ap_max_mem_free = APR_ALLOCATOR_MAX_FREE_UNLIMITED; -#endif apr_cpystrn(ap_coredump_dir, ap_server_root, sizeof(ap_coredump_dir)); diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c index a8e2c03559..f486c9762e 100644 --- a/server/mpm/worker/worker.c +++ b/server/mpm/worker/worker.c @@ -1759,12 +1759,10 @@ static int worker_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) ap_get_server_description()); ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf, "Server built: %s", ap_get_server_built()); -#ifdef AP_MPM_WANT_SET_ACCEPT_LOCK_MECH ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, "AcceptMutex: %s (default: %s)", apr_proc_mutex_name(accept_mutex), apr_proc_mutex_defname()); -#endif restart_pending = shutdown_pending = 0; mpm_state = AP_MPMQ_RUNNING; @@ -1987,9 +1985,7 @@ static int worker_pre_config(apr_pool_t *pconf, apr_pool_t *plog, ap_lock_fname = DEFAULT_LOCKFILE; ap_max_requests_per_child = DEFAULT_MAX_REQUESTS_PER_CHILD; ap_extended_status = 0; -#ifdef AP_MPM_WANT_SET_MAX_MEM_FREE - ap_max_mem_free = APR_ALLOCATOR_MAX_FREE_UNLIMITED; -#endif + ap_max_mem_free = APR_ALLOCATOR_MAX_FREE_UNLIMITED; apr_cpystrn(ap_coredump_dir, ap_server_root, sizeof(ap_coredump_dir)); -- 2.50.1