mirror of
https://github.com/apache/httpd.git
synced 2025-08-08 15:02:10 +03:00
Catch up with ap_[proc|global]_mutex_create api change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@940981 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -322,7 +322,8 @@ static int initialize_tables(server_rec *s, apr_pool_t *ctx)
|
||||
client_list->tbl_len = num_buckets;
|
||||
client_list->num_entries = 0;
|
||||
|
||||
sts = ap_global_mutex_create(&client_lock, client_mutex_type, NULL, s, ctx, 0);
|
||||
sts = ap_global_mutex_create(&client_lock, NULL, 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 +339,8 @@ static int initialize_tables(server_rec *s, apr_pool_t *ctx)
|
||||
}
|
||||
*opaque_cntr = 1UL;
|
||||
|
||||
sts = ap_global_mutex_create(&opaque_lock, opaque_mutex_type, NULL, s, ctx, 0);
|
||||
sts = ap_global_mutex_create(&opaque_lock, NULL, 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;
|
||||
|
@@ -528,7 +528,7 @@ static int wd_post_config_hook(apr_pool_t *pconf, apr_pool_t *plog,
|
||||
* Create mutexes for singleton watchdogs
|
||||
*/
|
||||
if (w->singleton) {
|
||||
rv = ap_proc_mutex_create(&w->mutex, wd_proc_mutex_type,
|
||||
rv = ap_proc_mutex_create(&w->mutex, NULL, wd_proc_mutex_type,
|
||||
w->name, s,
|
||||
wd_server_conf->pool, 0);
|
||||
if (rv != APR_SUCCESS) {
|
||||
|
@@ -186,8 +186,8 @@ static int exipc_post_config(apr_pool_t *pconf, apr_pool_t *plog,
|
||||
|
||||
/* Create global mutex */
|
||||
|
||||
rs = ap_global_mutex_create(&exipc_mutex, exipc_mutex_type, NULL, s, pconf,
|
||||
0);
|
||||
rs = ap_global_mutex_create(&exipc_mutex, NULL, exipc_mutex_type, NULL,
|
||||
s, pconf, 0);
|
||||
if (APR_SUCCESS != rs) {
|
||||
return HTTP_INTERNAL_SERVER_ERROR;
|
||||
}
|
||||
|
@@ -2734,7 +2734,7 @@ static int util_ldap_post_config(apr_pool_t *p, apr_pool_t *plog,
|
||||
return DONE;
|
||||
}
|
||||
|
||||
result = ap_global_mutex_create(&st->util_ldap_cache_lock,
|
||||
result = ap_global_mutex_create(&st->util_ldap_cache_lock, NULL,
|
||||
ldap_cache_mutex_type, NULL, s, p, 0);
|
||||
if (result != APR_SUCCESS) {
|
||||
return result;
|
||||
|
@@ -2645,7 +2645,7 @@ static apr_status_t rewritelock_create(server_rec *s, apr_pool_t *p)
|
||||
/* XXX See if there are any rewrite map programs before creating
|
||||
* the mutex.
|
||||
*/
|
||||
rc = ap_global_mutex_create(&rewrite_mapr_lock_acquire,
|
||||
rc = ap_global_mutex_create(&rewrite_mapr_lock_acquire, NULL,
|
||||
rewritemap_mutex_type, NULL, s, p, 0);
|
||||
if (rc != APR_SUCCESS) {
|
||||
return rc;
|
||||
|
@@ -47,8 +47,8 @@ int ssl_mutex_init(server_rec *s, apr_pool_t *p)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
if ((rv = ap_global_mutex_create(&mc->pMutex, SSL_CACHE_MUTEX_TYPE, NULL,
|
||||
s, s->process->pool, 0))
|
||||
if ((rv = ap_global_mutex_create(&mc->pMutex, NULL, SSL_CACHE_MUTEX_TYPE,
|
||||
NULL, s, s->process->pool, 0))
|
||||
!= APR_SUCCESS) {
|
||||
return FALSE;
|
||||
}
|
||||
|
@@ -481,7 +481,7 @@ int ssl_stapling_mutex_init(server_rec *s, apr_pool_t *p)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
if ((rv = ap_global_mutex_create(&mc->stapling_mutex,
|
||||
if ((rv = ap_global_mutex_create(&mc->stapling_mutex, NULL,
|
||||
SSL_STAPLING_MUTEX_TYPE, NULL, s,
|
||||
s->process->pool, 0)) != APR_SUCCESS) {
|
||||
return FALSE;
|
||||
|
@@ -915,8 +915,8 @@ static int prefork_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
|
||||
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,
|
||||
_pconf, 0);
|
||||
rv = ap_proc_mutex_create(&accept_mutex, NULL, AP_ACCEPT_MUTEX_TYPE, NULL,
|
||||
s, _pconf, 0);
|
||||
if (rv != APR_SUCCESS) {
|
||||
mpm_state = AP_MPMQ_STOPPING;
|
||||
return DONE;
|
||||
|
@@ -1707,8 +1707,8 @@ static int worker_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
|
||||
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,
|
||||
_pconf, 0);
|
||||
rv = ap_proc_mutex_create(&accept_mutex, NAME, AP_ACCEPT_MUTEX_TYPE, NULL,
|
||||
s, _pconf, 0);
|
||||
if (rv != APR_SUCCESS) {
|
||||
mpm_state = AP_MPMQ_STOPPING;
|
||||
return DONE;
|
||||
|
Reference in New Issue
Block a user