Mercurial > hg > nginx

comparison src/http/ngx_http_upstream.c @ 5293:2c4eb6ecba26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upstream: busy lock remnants removed.
author Maxim Dounin <mdounin@mdounin.ru>
date Thu, 25 Jul 2013 14:55:59 +0400
parents 8f9da50cf912
children d44c3b36c53f
comparison
equal deleted inserted replaced
5292:8f9da50cf912 5293:2c4eb6ecba26
3024 #endif 3024 #endif
3025 3025
3026 if (p->upstream_done || p->upstream_eof || p->upstream_error) { 3026 if (p->upstream_done || p->upstream_eof || p->upstream_error) {
3027 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, 3027 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
3028 "http upstream exit: %p", p->out); 3028 "http upstream exit: %p", p->out);
3029 #if 0
3030 ngx_http_busy_unlock(u->conf->busy_lock, &u->busy_lock);
3031 #endif
3032 ngx_http_upstream_finalize_request(r, u, 0); 3029 ngx_http_upstream_finalize_request(r, u, 0);
3033 return; 3030 return;
3034 } 3031 }
3035 } 3032 }
3036 3033
3137 ngx_uint_t status, state; 3134 ngx_uint_t status, state;
3138 3135
3139 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, 3136 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
3140 "http next upstream, %xi", ft_type); 3137 "http next upstream, %xi", ft_type);
3141 3138
3142 #if 0
3143 ngx_http_busy_unlock(u->conf->busy_lock, &u->busy_lock);
3144 #endif
3145
3146 if (u->peer.sockaddr) { 3139 if (u->peer.sockaddr) {
3147 3140
3148 if (ft_type == NGX_HTTP_UPSTREAM_FT_HTTP_403 3141 if (ft_type == NGX_HTTP_UPSTREAM_FT_HTTP_403
3149 || ft_type == NGX_HTTP_UPSTREAM_FT_HTTP_404) 3142 || ft_type == NGX_HTTP_UPSTREAM_FT_HTTP_404)
3150 { 3143 {
3253 } 3246 }
3254 3247
3255 ngx_close_connection(u->peer.connection); 3248 ngx_close_connection(u->peer.connection);
3256 u->peer.connection = NULL; 3249 u->peer.connection = NULL;
3257 } 3250 }
3258
3259 #if 0
3260 if (u->conf->busy_lock && !u->busy_locked) {
3261 ngx_http_upstream_busy_lock(p);
3262 return;
3263 }
3264 #endif
3265 3251
3266 ngx_http_upstream_connect(r, u); 3252 ngx_http_upstream_connect(r, u);
3267 } 3253 }
3268 3254
3269 3255