diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-02-05 19:23:44 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-02-05 19:23:44 +0000 |
| commit | c8d012d425137f36ee0b509ce1e95f339cfe5cbc (patch) | |
| tree | 4d428dc31b90dccf991507e4daa6dd33c63d9986 /src/http/modules/ngx_http_scgi_module.c | |
| parent | 8bfb37e9f0e808483cd9754c020292a9cb35e342 (diff) | |
| download | nginx-c8d012d425137f36ee0b509ce1e95f339cfe5cbc.tar.gz nginx-c8d012d425137f36ee0b509ce1e95f339cfe5cbc.tar.bz2 | |
Merge of r4402:
Fixed proxy_cache_use_stale in "no live upstreams" case.
Diffstat (limited to 'src/http/modules/ngx_http_scgi_module.c')
| -rw-r--r-- | src/http/modules/ngx_http_scgi_module.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/http/modules/ngx_http_scgi_module.c b/src/http/modules/ngx_http_scgi_module.c index e6c3afaed..103601f45 100644 --- a/src/http/modules/ngx_http_scgi_module.c +++ b/src/http/modules/ngx_http_scgi_module.c @@ -1237,6 +1237,10 @@ ngx_http_scgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) |NGX_HTTP_UPSTREAM_FT_OFF; } + if (conf->upstream.cache_use_stale & NGX_HTTP_UPSTREAM_FT_ERROR) { + conf->upstream.cache_use_stale |= NGX_HTTP_UPSTREAM_FT_NOLIVE; + } + if (conf->upstream.cache_methods == 0) { conf->upstream.cache_methods = prev->upstream.cache_methods; } |