You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2010/02/08 17:59:45 UTC
svn commit: r907723 - in /httpd/httpd/trunk: include/mpm_common.h
server/mpm/prefork/prefork.c server/mpm/worker/worker.c
Author: trawick
Date: Mon Feb 8 16:59:45 2010
New Revision: 907723
URL: http://svn.apache.org/viewvc?rev=907723&view=rev
Log:
change the preprocessor define ap_accept_mutex_type to upper case
Modified:
httpd/httpd/trunk/include/mpm_common.h
httpd/httpd/trunk/server/mpm/prefork/prefork.c
httpd/httpd/trunk/server/mpm/worker/worker.c
Modified: httpd/httpd/trunk/include/mpm_common.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/mpm_common.h?rev=907723&r1=907722&r2=907723&view=diff
==============================================================================
--- httpd/httpd/trunk/include/mpm_common.h (original)
+++ httpd/httpd/trunk/include/mpm_common.h Mon Feb 8 16:59:45 2010
@@ -330,7 +330,7 @@
/* mutex type string for accept mutex, if any; MPMs should use the
* same mutex type for ease of configuration
*/
-#define ap_accept_mutex_type "mpm-accept"
+#define AP_ACCEPT_MUTEX_TYPE "mpm-accept"
#ifdef __cplusplus
}
Modified: httpd/httpd/trunk/server/mpm/prefork/prefork.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/prefork/prefork.c?rev=907723&r1=907722&r2=907723&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/prefork/prefork.c (original)
+++ httpd/httpd/trunk/server/mpm/prefork/prefork.c Mon Feb 8 16:59:45 2010
@@ -915,7 +915,7 @@
ap_log_pid(pconf, ap_pid_fname);
/* Initialize cross-process accept lock */
- rv = ap_proc_mutex_create(&accept_mutex, ap_accept_mutex_type, NULL, s,
+ rv = ap_proc_mutex_create(&accept_mutex, AP_ACCEPT_MUTEX_TYPE, NULL, s,
_pconf, 0);
if (rv != APR_SUCCESS) {
mpm_state = AP_MPMQ_STOPPING;
@@ -1268,7 +1268,7 @@
foreground = ap_exists_config_define("FOREGROUND");
}
- ap_mutex_register(p, ap_accept_mutex_type, NULL, APR_LOCK_DEFAULT, 0);
+ ap_mutex_register(p, AP_ACCEPT_MUTEX_TYPE, NULL, APR_LOCK_DEFAULT, 0);
/* sigh, want this only the second time around */
retained = ap_retained_data_get(userdata_key);
Modified: httpd/httpd/trunk/server/mpm/worker/worker.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/worker/worker.c?rev=907723&r1=907722&r2=907723&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/worker/worker.c (original)
+++ httpd/httpd/trunk/server/mpm/worker/worker.c Mon Feb 8 16:59:45 2010
@@ -1707,7 +1707,7 @@
ap_log_pid(pconf, ap_pid_fname);
/* Initialize cross-process accept lock */
- rv = ap_proc_mutex_create(&accept_mutex, ap_accept_mutex_type, NULL, s,
+ rv = ap_proc_mutex_create(&accept_mutex, AP_ACCEPT_MUTEX_TYPE, NULL, s,
_pconf, 0);
if (rv != APR_SUCCESS) {
mpm_state = AP_MPMQ_STOPPING;
@@ -1950,7 +1950,7 @@
foreground = ap_exists_config_define("FOREGROUND");
}
- ap_mutex_register(pconf, ap_accept_mutex_type, NULL, APR_LOCK_DEFAULT, 0);
+ ap_mutex_register(pconf, AP_ACCEPT_MUTEX_TYPE, NULL, APR_LOCK_DEFAULT, 0);
/* sigh, want this only the second time around */
retained = ap_retained_data_get(userdata_key);