Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nginx/nginx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/event/ngx_event_accept.c')
-rw-r--r--src/event/ngx_event_accept.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c
index fb43af432..afb1a1f3b 100644
--- a/src/event/ngx_event_accept.c
+++ b/src/event/ngx_event_accept.c
@@ -265,9 +265,7 @@ ngx_trylock_accept_mutex(ngx_cycle_t *cycle)
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
"accept mutex locked");
- if (ngx_accept_mutex_held
- && (!(ngx_event_flags & NGX_USE_RTSIG_EVENT)
- || *ngx_accept_mutex_last_owner == (ngx_atomic_t) ngx_pid))
+ if (ngx_accept_mutex_held && !(ngx_event_flags & NGX_USE_RTSIG_EVENT))
{
return NGX_OK;
}
@@ -308,16 +306,10 @@ ngx_enable_accept_events(ngx_cycle_t *cycle)
if (ngx_event_flags & NGX_USE_RTSIG_EVENT) {
- if (ngx_accept_mutex_held) {
- c->read->disabled = 1;
- }
-
if (ngx_add_conn(c) == NGX_ERROR) {
return NGX_ERROR;
}
- *ngx_accept_mutex_last_owner = ngx_pid;
-
} else {
if (ngx_add_event(c->read, NGX_READ_EVENT, 0) == NGX_ERROR) {
return NGX_ERROR;