Commit e6cb5af2 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Now that we have the functionality in apr, we can now have 2.0's 

startup message regarding AcceptMutex (what we are using and what
the default is) "fully" match what is present in 1.3.
PR:
Obtained from:
Submitted by:
Reviewed by:


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

CHANGES

+3 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.37













  *) Make 2.0's "AcceptMutex" startup message now "completely"













     match how 1.3 does it. [Jim Jagielski]



























  *) Implement a fixed size memory cache using a priority queue















     [Ian Holsman]















































server/mpm/experimental/leader/leader.c



+3
−1






























Original line number
Diff line number
Diff line








@@ -1642,7 +1642,9 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)













                "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", ap_valid_accept_mutex_string);













		"AcceptMutex: %s (default: %s)",













		apr_proc_mutex_name(accept_mutex),













		apr_proc_mutex_defname());















#endif















    restart_pending = shutdown_pending = 0;

















































server/mpm/experimental/perchild/perchild.c



+3
−1






























Original line number
Diff line number
Diff line








@@ -1326,7 +1326,9 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)













                 "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", ap_valid_accept_mutex_string);













		"AcceptMutex: %s (default: %s)",













		apr_proc_mutex_name(accept_mutex),













		apr_proc_mutex_defname());















#endif















    restart_pending = shutdown_pending = 0;

















































server/mpm/experimental/threadpool/threadpool.c



+3
−1






























Original line number
Diff line number
Diff line








@@ -1862,7 +1862,9 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)













                "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", ap_valid_accept_mutex_string);













		"AcceptMutex: %s (default: %s)",













		apr_proc_mutex_name(accept_mutex),













		apr_proc_mutex_defname());















#endif















    restart_pending = shutdown_pending = 0;

















































server/mpm/mpmt_os2/mpmt_os2.c



+3
−1






























Original line number
Diff line number
Diff line








@@ -317,7 +317,9 @@ static char master_main()













		"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", ap_valid_accept_mutex_string);













		"AcceptMutex: %s (default: %s)",













		apr_proc_mutex_name(accept_mutex),













		apr_proc_mutex_defname());















#endif















    if (one_process) {















        ap_scoreboard_image->parent[0].pid = getpid();