Mercurial > hg > nginx
comparison src/http/modules/ngx_http_scgi_module.c @ 4401:d45742815c90
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 |
---|---|
1282 |NGX_HTTP_UPSTREAM_FT_OFF)); | 1282 |NGX_HTTP_UPSTREAM_FT_OFF)); |
1283 | 1283 |
1284 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_OFF) { | 1284 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_OFF) { |
1285 conf->upstream.cache_use_stale = NGX_CONF_BITMASK_SET | 1285 conf->upstream.cache_use_stale = NGX_CONF_BITMASK_SET |
1286 |NGX_HTTP_UPSTREAM_FT_OFF; | 1286 |NGX_HTTP_UPSTREAM_FT_OFF; |
1287 } | |
1288 | |
1289 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_ERROR) { | |
1290 conf->upstream.cache_use_stale |= NGX_HTTP_UPSTREAM_FT_NOLIVE; | |
1287 } | 1291 } |
1288 | 1292 |
1289 if (conf->upstream.cache_methods == 0) { | 1293 if (conf->upstream.cache_methods == 0) { |
1290 conf->upstream.cache_methods = prev->upstream.cache_methods; | 1294 conf->upstream.cache_methods = prev->upstream.cache_methods; |
1291 } | 1295 } |