Mercurial > hg > nginx
changeset 5104:93713d4b99c3
Removed c->single_connection flag.
The c->single_connection was intended to be used as lock mechanism
to serialize modifications of request object from several threads
working with client and upstream connections. The flag is redundant
since threads in nginx have never been used that way.
author | Valentin Bartenev <vbart@nginx.com> |
---|---|
date | Thu, 07 Mar 2013 18:07:16 +0000 |
parents | 05a56ebb084a |
children | 4d67b696388f |
files | src/core/ngx_connection.c src/core/ngx_connection.h src/http/ngx_http_request.c src/http/ngx_http_upstream.c |
diffstat | 4 files changed, 3 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_connection.c Thu Mar 07 17:59:27 2013 +0000 +++ b/src/core/ngx_connection.c Thu Mar 07 18:07:16 2013 +0000 @@ -900,11 +900,9 @@ c->read->closed = 1; c->write->closed = 1; - if (c->single_connection) { - ngx_unlock(&c->lock); - c->read->locked = 0; - c->write->locked = 0; - } + ngx_unlock(&c->lock); + c->read->locked = 0; + c->write->locked = 0; ngx_mutex_unlock(ngx_posted_events_mutex);
--- a/src/core/ngx_connection.h Thu Mar 07 17:59:27 2013 +0000 +++ b/src/core/ngx_connection.h Thu Mar 07 18:07:16 2013 +0000 @@ -152,7 +152,6 @@ unsigned log_error:3; /* ngx_connection_log_error_e */ - unsigned single_connection:1; unsigned unexpected_eof:1; unsigned timedout:1; unsigned error:1;
--- a/src/http/ngx_http_request.c Thu Mar 07 17:59:27 2013 +0000 +++ b/src/http/ngx_http_request.c Thu Mar 07 18:07:16 2013 +0000 @@ -554,7 +554,6 @@ return; } - c->single_connection = 1; c->destroyed = 0; #if (NGX_HTTP_SSL)
--- a/src/http/ngx_http_upstream.c Thu Mar 07 17:59:27 2013 +0000 +++ b/src/http/ngx_http_upstream.c Thu Mar 07 18:07:16 2013 +0000 @@ -1118,8 +1118,6 @@ r->connection->log->action = "connecting to upstream"; - r->connection->single_connection = 0; - if (u->state && u->state->response_sec) { tp = ngx_timeofday(); u->state->response_sec = tp->sec - u->state->response_sec;