Mercurial > hg > nginx-vendor-1-0

comparison src/http/ngx_http_upstream.c @ 642:1b80544421e8 NGINX_1_0_11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.0.11 *) Change: now double quotes are encoded in an "echo" SSI-command output. Thanks to Zaur Abasmirzoev. *) Feature: the "image_filter_sharpen" directive. *) Bugfix: a segmentation fault might occur in a worker process if SNI was used; the bug had appeared in 1.0.9. *) Bugfix: SIGWINCH signal did not work after first binary upgrade; the bug had appeared in 1.0.9. *) Bugfix: the "If-Modified-Since", "If-Range", etc. client request header lines might be passed to backend while caching; or not passed without caching if caching was enabled in another part of the configuration. *) Bugfix: in the "scgi_param" directive, if complex parameters were used. *) Bugfix: "add_header" and "expires" directives did not work if a request was proxied and response status code was 206. *) Bugfix: in the "expires @time" directive. *) Bugfix: in the ngx_http_flv_module. Thanks to Piotr Sikora. *) Bugfix: in the ngx_http_mp4_module. *) Bugfix: nginx could not be built on FreeBSD 10. *) Bugfix: nginx could not be built on AIX.
author Igor Sysoev <http://sysoev.ru>
date Thu, 15 Dec 2011 00:00:00 +0400
parents 692f4d4d7f10
children ad25218fd14b
comparison
equal deleted inserted replaced
641:e21c9e01ce08 642:1b80544421e8
2886 (void) ngx_ssl_shutdown(u->peer.connection); 2886 (void) ngx_ssl_shutdown(u->peer.connection);
2887 } 2887 }
2888 #endif 2888 #endif
2889 2889
2890 ngx_close_connection(u->peer.connection); 2890 ngx_close_connection(u->peer.connection);
2891 u->peer.connection = NULL;
2891 } 2892 }
2892 2893
2893 #if 0 2894 #if 0
2894 if (u->conf->busy_lock && !u->busy_locked) { 2895 if (u->conf->busy_lock && !u->busy_locked) {
2895 ngx_http_upstream_busy_lock(p); 2896 ngx_http_upstream_busy_lock(p);
4277 && uscfp[i]->default_port != u->default_port) 4278 && uscfp[i]->default_port != u->default_port)
4278 { 4279 {
4279 continue; 4280 continue;
4280 } 4281 }
4281 4282
4283 if (flags & NGX_HTTP_UPSTREAM_CREATE) {
4284 uscfp[i]->flags = flags;
4285 }
4286
4282 return uscfp[i]; 4287 return uscfp[i];
4283 } 4288 }
4284 4289
4285 uscf = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_srv_conf_t)); 4290 uscf = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_srv_conf_t));
4286 if (uscf == NULL) { 4291 if (uscf == NULL) {