Mercurial > hg > nginx

diff src/http/modules/ngx_http_uwsgi_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 94b995c7c614
children 4919fb357a5d
line wrap: on
line diff
--- a/src/http/modules/ngx_http_uwsgi_module.c
+++ b/src/http/modules/ngx_http_uwsgi_module.c
@@ -1298,6 +1298,10 @@ ngx_http_uwsgi_merge_loc_conf(ngx_conf_t
                                          |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;
     }