Mercurial > hg > nginx-vendor-current

diff src/event/ngx_event.c @ 258:6ae1357b7b7c NGINX_0_4_14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.4.14 *) Feature: the "proxy_pass_error_message" directive in IMAP/POP3 proxy. *) Feature: now configure detects system PCRE library on FreeBSD, Linux, and NetBSD. *) Bugfix: ngx_http_perl_module did not work with perl built with the threads support; bug appeared in 0.3.38. *) Bugfix: ngx_http_perl_module did not work if perl was called recursively. *) Bugfix: nginx ignored a host name in an request line. *) Bugfix: a worker process may got caught in an endless loop, if a FastCGI server sent too many data to the stderr. *) Bugfix: the $upstream_response_time variable may be negative if the system time was changed backward. *) Bugfix: the "Auth-Login-Attempt" parameter was not sent to IMAP/POP3 proxy authentication server when POP3 was used. *) Bugfix: a segmentation fault might occur if connect to IMAP/POP3 proxy authentication server failed.
author Igor Sysoev <http://sysoev.ru>
date Mon, 27 Nov 2006 00:00:00 +0300
parents c982febb7588
children 675a39fd14cd
line wrap: on
line diff
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -483,18 +483,7 @@ ngx_event_module_init(ngx_cycle_t *cycle
         return NGX_OK;
     }
 
-
     if (ngx_accept_mutex_ptr) {
-
-        /* reinit ngx_accept_mutex */
-
-        if (ngx_shmtx_create(&ngx_accept_mutex, (void *) ngx_accept_mutex_ptr,
-                             ccf->lock_file.data, cycle->log)
-                != NGX_OK)
-        {
-            return NGX_ERROR;
-        }
-
         return NGX_OK;
     }
 
@@ -528,8 +517,7 @@ ngx_event_module_init(ngx_cycle_t *cycle
 
     ngx_accept_mutex_ptr = (ngx_atomic_t *) shared;
 
-    if (ngx_shmtx_create(&ngx_accept_mutex, shared, ccf->lock_file.data,
-                         cycle->log)
+    if (ngx_shmtx_create(&ngx_accept_mutex, shared, cycle->lock_file.data)
         != NGX_OK)
     {
         return NGX_ERROR;
@@ -596,7 +584,7 @@ ngx_event_process_init(ngx_cycle_t *cycl
     ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
     ecf = ngx_event_get_conf(cycle->conf_ctx, ngx_event_core_module);
 
-    if (ccf->worker_processes > 1 && ecf->accept_mutex) {
+    if (ccf->master && ccf->worker_processes > 1 && ecf->accept_mutex) {
         ngx_use_accept_mutex = 1;
         ngx_accept_mutex_held = 0;
         ngx_accept_mutex_delay = ecf->accept_mutex_delay;