diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c index 896b775c5..9152af3f7 100644 --- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -943,18 +943,6 @@ ngx_close_connection(ngx_connection_t *c) } } -#if (NGX_OLD_THREADS) - - /* - * we have to clean the connection information before the closing - * because another thread may reopen the same file descriptor - * before we clean the connection - */ - - ngx_unlock(&c->lock); - -#endif - if (c->read->posted) { ngx_delete_posted_event(c->read); } diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h index 1867b4cbc..f1ca9619b 100644 --- a/src/core/ngx_connection.h +++ b/src/core/ngx_connection.h @@ -187,10 +187,6 @@ struct ngx_connection_s { #if (NGX_THREADS) ngx_thread_task_t *sendfile_task; #endif - -#if (NGX_OLD_THREADS) - ngx_atomic_t lock; -#endif }; diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c index 885528aae..31514c44b 100644 --- a/src/event/ngx_event.c +++ b/src/event/ngx_event.c @@ -721,10 +721,6 @@ ngx_event_process_init(ngx_cycle_t *cycle) c[i].fd = (ngx_socket_t) -1; next = &c[i]; - -#if (NGX_OLD_THREADS) - c[i].lock = 0; -#endif } while (i); cycle->free_connections = next; diff --git a/src/event/ngx_event_connect.h b/src/event/ngx_event_connect.h index ab35836a2..ed18db7c3 100644 --- a/src/event/ngx_event_connect.h +++ b/src/event/ngx_event_connect.h @@ -53,10 +53,6 @@ struct ngx_peer_connection_s { ngx_event_save_peer_session_pt save_session; #endif -#if (NGX_OLD_THREADS) - ngx_atomic_t *lock; -#endif - ngx_addr_t *local; int rcvbuf; diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index fcff4a4c3..3c2efadd6 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -446,9 +446,6 @@ ngx_http_upstream_create(ngx_http_request_t *r) u->peer.log = r->connection->log; u->peer.log_error = NGX_ERROR_ERR; -#if (NGX_OLD_THREADS) - u->peer.lock = &r->connection->lock; -#endif #if (NGX_HTTP_CACHE) r->cache = NULL;