Mercurial > hg > nginx

comparison src/http/modules/ngx_http_uwsgi_module.c @ 4447:2b2d51cdbd97 stable-1.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge of r4402: Fixed proxy_cache_use_stale in "no live upstreams" case.
author Maxim Dounin <mdounin@mdounin.ru>
date Sun, 05 Feb 2012 19:23:44 +0000
parents 94b995c7c614
children 4919fb357a5d
comparison
equal deleted inserted replaced
4446:fd40c9ef750d 4447:2b2d51cdbd97
1294 |NGX_HTTP_UPSTREAM_FT_OFF)); 1294 |NGX_HTTP_UPSTREAM_FT_OFF));
1295 1295
1296 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_OFF) { 1296 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_OFF) {
1297 conf->upstream.cache_use_stale = NGX_CONF_BITMASK_SET 1297 conf->upstream.cache_use_stale = NGX_CONF_BITMASK_SET
1298 |NGX_HTTP_UPSTREAM_FT_OFF; 1298 |NGX_HTTP_UPSTREAM_FT_OFF;
1299 }
1300
1301 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_ERROR) {
1302 conf->upstream.cache_use_stale |= NGX_HTTP_UPSTREAM_FT_NOLIVE;
1299 } 1303 }
1300 1304
1301 if (conf->upstream.cache_methods == 0) { 1305 if (conf->upstream.cache_methods == 0) {
1302 conf->upstream.cache_methods = prev->upstream.cache_methods; 1306 conf->upstream.cache_methods = prev->upstream.cache_methods;
1303 } 1307 }