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

diff --git a/CHANGES b/CHANGES
index 7b63feca76dafbd63e997165633a74f7e0faa606..33c5a829e0eb78b681e37064303c5c528ea363fb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 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]
 

diff --git a/server/mpm/experimental/leader/leader.c b/server/mpm/experimental/leader/leader.c
index 2e0c95694426b30876c227454d45f0161c4da34d..661b0fce667c77530e077e6d36c346ad492b1608 100644 (file)
--- a/server/mpm/experimental/leader/leader.c
+++ b/server/mpm/experimental/leader/leader.c
@@ -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;
 

diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c
index 08ec9385c6ff40a88445bc2e4c209d1dd9d4ec5c..53261026cc57124d677837aa16552517953b5227 100644 (file)
--- a/server/mpm/experimental/perchild/perchild.c
+++ b/server/mpm/experimental/perchild/perchild.c
@@ -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;
 

diff --git a/server/mpm/experimental/threadpool/threadpool.c b/server/mpm/experimental/threadpool/threadpool.c
index 0563394b69b14aea9cf8707580a81cef37cd0347..dffd4634f9a2469c0edccafb397b147d3f67d2cc 100644 (file)
--- a/server/mpm/experimental/threadpool/threadpool.c
+++ b/server/mpm/experimental/threadpool/threadpool.c
@@ -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;
 

diff --git a/server/mpm/mpmt_os2/mpmt_os2.c b/server/mpm/mpmt_os2/mpmt_os2.c
index 621675d36d86f27a905e70db8bb363a1d8d2ef01..84addf8e69e3d11d91c7566f5d61cd42fd7a3489 100644 (file)
--- a/server/mpm/mpmt_os2/mpmt_os2.c
+++ b/server/mpm/mpmt_os2/mpmt_os2.c
@@ -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();

diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c
index bcc2d32caff50521721d14e74549fbd882cfe9cd..c4de43bffb7423ef74f7578d6517d66527357cc7 100644 (file)
--- a/server/mpm/netware/mpm_netware.c
+++ b/server/mpm/netware/mpm_netware.c
@@ -923,7 +923,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
     show_server_data();
 

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 428912914a21dcb1d61d750daa69775d119f80be..87c13f2775b8b6560a0b443e39e97379acc70117 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -1012,7 +1012,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;
 

diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 5f801a627a5d359b0922eef7e59ede538db3bfb0..9882091551277a415151bbd46007185fd501b359 100644 (file)
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -1732,7 +1732,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;