Mercurial > hg > nginx
comparison src/http/modules/ngx_http_fastcgi_module.c @ 4447:2b2d51cdbd97 stable-1.0
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 |
---|---|
2212 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_OFF) { | 2212 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_OFF) { |
2213 conf->upstream.cache_use_stale = NGX_CONF_BITMASK_SET | 2213 conf->upstream.cache_use_stale = NGX_CONF_BITMASK_SET |
2214 |NGX_HTTP_UPSTREAM_FT_OFF; | 2214 |NGX_HTTP_UPSTREAM_FT_OFF; |
2215 } | 2215 } |
2216 | 2216 |
2217 if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_ERROR) { | |
2218 conf->upstream.cache_use_stale |= NGX_HTTP_UPSTREAM_FT_NOLIVE; | |
2219 } | |
2220 | |
2217 if (conf->upstream.cache_methods == 0) { | 2221 if (conf->upstream.cache_methods == 0) { |
2218 conf->upstream.cache_methods = prev->upstream.cache_methods; | 2222 conf->upstream.cache_methods = prev->upstream.cache_methods; |
2219 } | 2223 } |
2220 | 2224 |
2221 conf->upstream.cache_methods |= NGX_HTTP_GET|NGX_HTTP_HEAD; | 2225 conf->upstream.cache_methods |= NGX_HTTP_GET|NGX_HTTP_HEAD; |