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 2009/11/24 15:47:56 UTC
svn commit: r883708 - in /httpd/httpd/trunk/modules: aaa/mod_auth_digest.c
core/mod_watchdog.c ldap/util_ldap.c
Author: trawick
Date: Tue Nov 24 14:47:55 2009
New Revision: 883708
URL: http://svn.apache.org/viewvc?rev=883708&view=rev
Log:
tweaks to r883540:
watchdog: use better mutex type name
ldap/digest: use same FOO_mutex_type variable name as other modules
for easier searching
Modified:
httpd/httpd/trunk/modules/aaa/mod_auth_digest.c
httpd/httpd/trunk/modules/core/mod_watchdog.c
httpd/httpd/trunk/modules/ldap/util_ldap.c
Modified: httpd/httpd/trunk/modules/aaa/mod_auth_digest.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_auth_digest.c?rev=883708&r1=883707&r2=883708&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_auth_digest.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_auth_digest.c Tue Nov 24 14:47:55 2009
@@ -180,8 +180,8 @@
static apr_time_t *otn_counter; /* one-time-nonce counter */
static apr_global_mutex_t *client_lock = NULL;
static apr_global_mutex_t *opaque_lock = NULL;
-static const char *client_lock_type = "authdigest-client";
-static const char *opaque_lock_type = "authdigest-opaque";
+static const char *client_mutex_type = "authdigest-client";
+static const char *opaque_mutex_type = "authdigest-opaque";
static const char *client_shm_filename;
#define DEF_SHMEM_SIZE 1000L /* ~ 12 entries */
@@ -322,7 +322,7 @@
client_list->tbl_len = num_buckets;
client_list->num_entries = 0;
- sts = ap_global_mutex_create(&client_lock, client_lock_type, NULL, s, ctx, 0);
+ sts = ap_global_mutex_create(&client_lock, client_mutex_type, NULL, s, ctx, 0);
if (sts != APR_SUCCESS) {
log_error_and_cleanup("failed to create lock (client_lock)", sts, s);
return !OK;
@@ -338,7 +338,7 @@
}
*opaque_cntr = 1UL;
- sts = ap_global_mutex_create(&opaque_lock, opaque_lock_type, NULL, s, ctx, 0);
+ sts = ap_global_mutex_create(&opaque_lock, opaque_mutex_type, NULL, s, ctx, 0);
if (sts != APR_SUCCESS) {
log_error_and_cleanup("failed to create lock (opaque_lock)", sts, s);
return !OK;
@@ -366,9 +366,9 @@
{
apr_status_t rv;
- rv = ap_mutex_register(pconf, client_lock_type, NULL, APR_LOCK_DEFAULT, 0);
+ rv = ap_mutex_register(pconf, client_mutex_type, NULL, APR_LOCK_DEFAULT, 0);
if (rv == APR_SUCCESS) {
- rv = ap_mutex_register(pconf, opaque_lock_type, NULL, APR_LOCK_DEFAULT,
+ rv = ap_mutex_register(pconf, opaque_mutex_type, NULL, APR_LOCK_DEFAULT,
0);
}
if (rv != APR_SUCCESS) {
Modified: httpd/httpd/trunk/modules/core/mod_watchdog.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/mod_watchdog.c?rev=883708&r1=883707&r2=883708&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/core/mod_watchdog.c (original)
+++ httpd/httpd/trunk/modules/core/mod_watchdog.c Tue Nov 24 14:47:55 2009
@@ -66,7 +66,7 @@
static apr_interval_time_t wd_interval = AP_WD_TM_INTERVAL;
static int wd_interval_set = 0;
static int mpm_is_forked = AP_MPMQ_NOT_SUPPORTED;
-static const char *wd_proc_mutex_type = "wd-proc";
+static const char *wd_proc_mutex_type = "watchdog-callback";
static apr_status_t wd_worker_cleanup(void *data)
{
Modified: httpd/httpd/trunk/modules/ldap/util_ldap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ldap/util_ldap.c?rev=883708&r1=883707&r2=883708&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ldap/util_ldap.c (original)
+++ httpd/httpd/trunk/modules/ldap/util_ldap.c Tue Nov 24 14:47:55 2009
@@ -64,7 +64,7 @@
#define AP_LDAP_CHASEREFERRALS_ON 1
module AP_MODULE_DECLARE_DATA ldap_module;
-static const char *ldap_cache_lock_type = "ldap-cache";
+static const char *ldap_cache_mutex_type = "ldap-cache";
#define LDAP_CACHE_LOCK() do { \
if (st->util_ldap_cache_lock) \
@@ -2521,7 +2521,7 @@
{
apr_status_t result;
- result = ap_mutex_register(pconf, ldap_cache_lock_type, NULL,
+ result = ap_mutex_register(pconf, ldap_cache_mutex_type, NULL,
APR_LOCK_DEFAULT, 0);
if (result != APR_SUCCESS) {
return result;
@@ -2580,7 +2580,7 @@
}
result = ap_global_mutex_create(&st->util_ldap_cache_lock,
- ldap_cache_lock_type, NULL, s, p, 0);
+ ldap_cache_mutex_type, NULL, s, p, 0);
if (result != APR_SUCCESS) {
return result;
}
@@ -2682,7 +2682,7 @@
ap_log_error(APLOG_MARK, APLOG_CRIT, sts, s,
"Failed to initialise global mutex %s in child process %"
APR_PID_T_FMT ".",
- ldap_cache_lock_type, getpid());
+ ldap_cache_mutex_type, getpid());
}
}