diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ngx_connection.c | 21 | ||||
| -rw-r--r-- | src/core/ngx_resolver.c | 11 |
2 files changed, 1 insertions, 31 deletions
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c index 4c42ffc0d..7b3daf20a 100644 --- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -951,26 +951,9 @@ ngx_close_connection(ngx_connection_t *c) * before we clean the connection */ - ngx_mutex_lock(ngx_posted_events_mutex); - - if (c->read->prev) { - ngx_delete_posted_event(c->read); - } - - if (c->write->prev) { - ngx_delete_posted_event(c->write); - } - - c->read->closed = 1; - c->write->closed = 1; - ngx_unlock(&c->lock); - c->read->locked = 0; - c->write->locked = 0; - - ngx_mutex_unlock(ngx_posted_events_mutex); -#else +#endif if (c->read->prev) { ngx_delete_posted_event(c->read); @@ -983,8 +966,6 @@ ngx_close_connection(ngx_connection_t *c) c->read->closed = 1; c->write->closed = 1; -#endif - ngx_reusable_connection(c, 0); log_error = c->log_error; diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c index 5f7897853..a17793b13 100644 --- a/src/core/ngx_resolver.c +++ b/src/core/ngx_resolver.c @@ -3082,17 +3082,6 @@ ngx_udp_connect(ngx_udp_connection_t *uc) c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1); -#if (NGX_THREADS) - - /* TODO: lock event when call completion handler */ - - rev->lock = &c->lock; - wev->lock = &c->lock; - rev->own_lock = &c->lock; - wev->own_lock = &c->lock; - -#endif - ngx_log_debug3(NGX_LOG_DEBUG_EVENT, &uc->log, 0, "connect to %V, fd:%d #%uA", &uc->server, s, c->number); |