Mercurial > hg > nginx

comparison src/http/modules/ngx_http_scgi_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 3a1507f48686
children 4919fb357a5d
comparison
equal deleted inserted replaced
4446:fd40c9ef750d 4447:2b2d51cdbd97
1233 |NGX_HTTP_UPSTREAM_FT_OFF)); 1233 |NGX_HTTP_UPSTREAM_FT_OFF));
1234 1234
1235 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_OFF) { 1235 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_OFF) {
1236 conf->upstream.cache_use_stale = NGX_CONF_BITMASK_SET 1236 conf->upstream.cache_use_stale = NGX_CONF_BITMASK_SET
1237 |NGX_HTTP_UPSTREAM_FT_OFF; 1237 |NGX_HTTP_UPSTREAM_FT_OFF;
1238 }
1239
1240 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_ERROR) {
1241 conf->upstream.cache_use_stale |= NGX_HTTP_UPSTREAM_FT_NOLIVE;
1238 } 1242 }
1239 1243
1240 if (conf->upstream.cache_methods == 0) { 1244 if (conf->upstream.cache_methods == 0) {
1241 conf->upstream.cache_methods = prev->upstream.cache_methods; 1245 conf->upstream.cache_methods = prev->upstream.cache_methods;
1242 } 1246 }