httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r940981 - in /httpd/httpd/trunk: modules/aaa/ modules/core/ modules/examples/ modules/ldap/ modules/mappers/ modules/ssl/ server/mpm/prefork/ server/mpm/worker/
Date Tue, 04 May 2010 17:40:43 GMT
Author: wrowe
Date: Tue May  4 17:40:43 2010
New Revision: 940981

URL: http://svn.apache.org/viewvc?rev=940981&view=rev
Log:
Catch up with ap_[proc|global]_mutex_create api change

Modified:
    httpd/httpd/trunk/modules/aaa/mod_auth_digest.c
    httpd/httpd/trunk/modules/core/mod_watchdog.c
    httpd/httpd/trunk/modules/examples/mod_example_ipc.c
    httpd/httpd/trunk/modules/ldap/util_ldap.c
    httpd/httpd/trunk/modules/mappers/mod_rewrite.c
    httpd/httpd/trunk/modules/ssl/ssl_engine_mutex.c
    httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c
    httpd/httpd/trunk/server/mpm/prefork/prefork.c
    httpd/httpd/trunk/server/mpm/worker/worker.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=940981&r1=940980&r2=940981&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_auth_digest.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_auth_digest.c Tue May  4 17:40:43 2010
@@ -322,7 +322,8 @@ static int initialize_tables(server_rec 
     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 
     }
     *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;

Modified: httpd/httpd/trunk/modules/core/mod_watchdog.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/mod_watchdog.c?rev=940981&r1=940980&r2=940981&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/core/mod_watchdog.c (original)
+++ httpd/httpd/trunk/modules/core/mod_watchdog.c Tue May  4 17:40:43 2010
@@ -528,7 +528,7 @@ static int wd_post_config_hook(apr_pool_
                      * 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) {

Modified: httpd/httpd/trunk/modules/examples/mod_example_ipc.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/examples/mod_example_ipc.c?rev=940981&r1=940980&r2=940981&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/examples/mod_example_ipc.c (original)
+++ httpd/httpd/trunk/modules/examples/mod_example_ipc.c Tue May  4 17:40:43 2010
@@ -186,8 +186,8 @@ static int exipc_post_config(apr_pool_t 
 
     /* 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;
     }

Modified: httpd/httpd/trunk/modules/ldap/util_ldap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ldap/util_ldap.c?rev=940981&r1=940980&r2=940981&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ldap/util_ldap.c (original)
+++ httpd/httpd/trunk/modules/ldap/util_ldap.c Tue May  4 17:40:43 2010
@@ -2734,7 +2734,7 @@ static int util_ldap_post_config(apr_poo
             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;

Modified: httpd/httpd/trunk/modules/mappers/mod_rewrite.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_rewrite.c?rev=940981&r1=940980&r2=940981&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_rewrite.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_rewrite.c Tue May  4 17:40:43 2010
@@ -2645,7 +2645,7 @@ static apr_status_t rewritelock_create(s
     /* 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;

Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_mutex.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_mutex.c?rev=940981&r1=940980&r2=940981&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_mutex.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_mutex.c Tue May  4 17:40:43 2010
@@ -47,8 +47,8 @@ int ssl_mutex_init(server_rec *s, apr_po
         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;
     }

Modified: httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c?rev=940981&r1=940980&r2=940981&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c Tue May  4 17:40:43 2010
@@ -481,7 +481,7 @@ int ssl_stapling_mutex_init(server_rec *
         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;

Modified: httpd/httpd/trunk/server/mpm/prefork/prefork.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/prefork/prefork.c?rev=940981&r1=940980&r2=940981&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/prefork/prefork.c (original)
+++ httpd/httpd/trunk/server/mpm/prefork/prefork.c Tue May  4 17:40:43 2010
@@ -915,8 +915,8 @@ static int prefork_run(apr_pool_t *_pcon
     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;

Modified: httpd/httpd/trunk/server/mpm/worker/worker.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/worker/worker.c?rev=940981&r1=940980&r2=940981&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/worker/worker.c (original)
+++ httpd/httpd/trunk/server/mpm/worker/worker.c Tue May  4 17:40:43 2010
@@ -1707,8 +1707,8 @@ static int worker_run(apr_pool_t *_pconf
     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;



Mime
View raw message