Mercurial > hg > nginx

comparison src/http/modules/ngx_http_uwsgi_module.c @ 4401:d45742815c90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed proxy_cache_use_stale in "no live upstreams" case.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 16 Jan 2012 11:01:52 +0000
parents 92deb73393f7
children d620f497c50f
comparison
equal deleted inserted replaced
4400:a0505851e70c 4401:d45742815c90
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 }