details: http://hg.nginx.org/nginx/rev/2c4eb6ecba26
branches:
changeset: 5293:2c4eb6ecba26
user: Maxim Dounin <mdounin@mdounin.ru>
date: Thu Jul 25 14:55:59 2013 +0400
description:
Upstream: busy lock remnants removed.

diffstat:

src/http/ngx_http_upstream.c | 14 --------------
1 files changed, 0 insertions(+), 14 deletions(-)

diffs (38 lines):

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -3026,9 +3026,6 @@ ngx_http_upstream_process_request(ngx_ht
if (p->upstream_done || p->upstream_eof || p->upstream_error) {
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"http upstream exit: %p", p->out);
-#if 0
- ngx_http_busy_unlock(u->conf->busy_lock, &u->busy_lock);
-#endif
ngx_http_upstream_finalize_request(r, u, 0);
return;
}
@@ -3139,10 +3136,6 @@ ngx_http_upstream_next(ngx_http_request_
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"http next upstream, %xi", ft_type);

-#if 0
- ngx_http_busy_unlock(u->conf->busy_lock, &u->busy_lock);
-#endif
-
if (u->peer.sockaddr) {

if (ft_type == NGX_HTTP_UPSTREAM_FT_HTTP_403
@@ -3256,13 +3249,6 @@ ngx_http_upstream_next(ngx_http_request_
u->peer.connection = NULL;
}

-#if 0
- if (u->conf->busy_lock && !u->busy_locked) {
- ngx_http_upstream_busy_lock(p);
- return;
- }
-#endif
-
ngx_http_upstream_connect(r, u);
}


_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel