nginx-0.0.3-2004-04-23-20:50:51 import

1 files changed, 5 insertions, 1 deletions

diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index cc03b5800..b3f6a5620 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -170,7 +170,7 @@ static ngx_int_t ngx_event_module_init(ngx_cycle_t *cycle)
 
     ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
 
-    if (ccf->master == 0) {
+    if (ccf->master == 0 || ngx_accept_mutex_ptr) {
         return NGX_OK;
     }
 
@@ -196,6 +196,10 @@ static ngx_int_t ngx_event_module_init(ngx_cycle_t *cycle)
 
     ngx_connection_counter = (ngx_atomic_t *) (shared + 128);
 
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
+                   "counter: " PTR_FMT ", %d",
+                   ngx_connection_counter, *ngx_connection_counter);
+
 #endif
 
     return NGX_OK;