Mercurial > hg > nginx-vendor-current

comparison src/http/modules/ngx_http_uwsgi_module.c @ 658:5a4401b9551b NGINX_1_1_13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.1.13 *) Feature: the "TLSv1.1" and "TLSv1.2" parameters of the "ssl_protocols" directive. *) Bugfix: the "limit_req" directive parameters were not inherited correctly; the bug had appeared in 1.1.12. *) Bugfix: the "proxy_redirect" directive incorrectly processed "Refresh" header if regular expression were used. *) Bugfix: the "proxy_cache_use_stale" directive with "error" parameter did not return answer from cache if there were no live upstreams. *) Bugfix: the "worker_cpu_affinity" directive might not work. *) Bugfix: nginx could not be built on Solaris; the bug had appeared in 1.1.12. *) Bugfix: in the ngx_http_mp4_module.
author Igor Sysoev <http://sysoev.ru>
date Mon, 16 Jan 2012 00:00:00 +0400
parents 9d21dad0b5a1
children d0f7a625f27c
comparison
equal deleted inserted replaced
657:e1296af53cc0 658:5a4401b9551b
1334 |NGX_HTTP_UPSTREAM_FT_OFF)); 1334 |NGX_HTTP_UPSTREAM_FT_OFF));
1335 1335
1336 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_OFF) { 1336 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_OFF) {
1337 conf->upstream.cache_use_stale = NGX_CONF_BITMASK_SET 1337 conf->upstream.cache_use_stale = NGX_CONF_BITMASK_SET
1338 |NGX_HTTP_UPSTREAM_FT_OFF; 1338 |NGX_HTTP_UPSTREAM_FT_OFF;
1339 }
1340
1341 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_ERROR) {
1342 conf->upstream.cache_use_stale |= NGX_HTTP_UPSTREAM_FT_NOLIVE;
1339 } 1343 }
1340 1344
1341 if (conf->upstream.cache_methods == 0) { 1345 if (conf->upstream.cache_methods == 0) {
1342 conf->upstream.cache_methods = prev->upstream.cache_methods; 1346 conf->upstream.cache_methods = prev->upstream.cache_methods;
1343 } 1347 }