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

diff --git a/modules/aaa/mod_auth_digest.c b/modules/aaa/mod_auth_digest.c
index 84744ebe62fd7c4060434f1e482740d48888d638..7ed5ec86effef471403efaf349a73301b586ad6e 100644 (file)
--- a/modules/aaa/mod_auth_digest.c
+++ b/modules/aaa/mod_auth_digest.c
@@ -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;

diff --git a/modules/core/mod_watchdog.c b/modules/core/mod_watchdog.c
index 8342dbf174922de1b059cf89bf1de3a5dd5f883c..02d785d9e23e3fac7b2292f8156bd22ceab4eb3b 100644 (file)
--- a/modules/core/mod_watchdog.c
+++ b/modules/core/mod_watchdog.c
@@ -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) {

diff --git a/modules/examples/mod_example_ipc.c b/modules/examples/mod_example_ipc.c
index 079ccac33987344db486be6a315c35a926e87e63..d0a83cfa980098d99f38c0653e860b55e503696a 100644 (file)
--- a/modules/examples/mod_example_ipc.c
+++ b/modules/examples/mod_example_ipc.c
@@ -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;
     }

diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c
index 3aa1d3cc1f6db5dcc8ef20ae862cca559dcb95d3..9643cf7d18dc68cd51f1dfc5be0096e359531110 100644 (file)
--- a/modules/ldap/util_ldap.c
+++ b/modules/ldap/util_ldap.c
@@ -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;

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 1fbd917620d455d55fd8976fbf8112a5d5839aaa..316ade60275b106d902dde9c96b69caf914945d8 100644 (file)
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -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;

diff --git a/modules/ssl/ssl_engine_mutex.c b/modules/ssl/ssl_engine_mutex.c
index 9c0b996c44419479ec7ce40c5af478db34b67b5e..c7f8582442cfdbd7338169f4e0b0ed25b36aeaad 100644 (file)
--- a/modules/ssl/ssl_engine_mutex.c
+++ b/modules/ssl/ssl_engine_mutex.c
@@ -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;
     }

diff --git a/modules/ssl/ssl_util_stapling.c b/modules/ssl/ssl_util_stapling.c
index 0f10cec8f31af9b03b6bc32bb220827621f5f418..0f781f60c237abe08c3885dd3869507f55ac3091 100644 (file)
--- a/modules/ssl/ssl_util_stapling.c
+++ b/modules/ssl/ssl_util_stapling.c
@@ -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;

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index ece71234e02221932ffd139c5f900d35acc59b29..358a9997a11525be300b79e91c9242b708568c37 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -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;

diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index c35ca94fa8af474a70e97d93ca10315401499fb8..c769ec06e70036ffc57229666ffd2398639752fe 100644 (file)
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -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;