Mercurial > hg > nginx-vendor-current

comparison src/http/modules/ngx_http_fastcgi_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
2312 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_OFF) { 2312 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_OFF) {
2313 conf->upstream.cache_use_stale = NGX_CONF_BITMASK_SET 2313 conf->upstream.cache_use_stale = NGX_CONF_BITMASK_SET
2314 |NGX_HTTP_UPSTREAM_FT_OFF; 2314 |NGX_HTTP_UPSTREAM_FT_OFF;
2315 } 2315 }
2316 2316
2317 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_ERROR) {
2318 conf->upstream.cache_use_stale |= NGX_HTTP_UPSTREAM_FT_NOLIVE;
2319 }
2320
2317 if (conf->upstream.cache_methods == 0) { 2321 if (conf->upstream.cache_methods == 0) {
2318 conf->upstream.cache_methods = prev->upstream.cache_methods; 2322 conf->upstream.cache_methods = prev->upstream.cache_methods;
2319 } 2323 }
2320 2324
2321 conf->upstream.cache_methods |= NGX_HTTP_GET|NGX_HTTP_HEAD; 2325 conf->upstream.cache_methods |= NGX_HTTP_GET|NGX_HTTP_HEAD;