From: Igor Sysoev <igor@sysoev.ru>
Date: Fri, 7 Aug 2009 13:16:42 +0000 (+0000)
Subject: fix segfault introduced in r3007
X-Git-Tag: release-0.8.8~1
X-Git-Url: http://git.kaiwu.me/sitemap.xml?a=commitdiff_plain;h=22fc3e656eef49133df3cf692ddaf2f6810cd1ea;p=nginx.git

fix segfault introduced in r3007
---

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 23cf1b605..e705da6c2 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -2883,7 +2883,7 @@ ngx_http_upstream_finalize_request(ngx_http_request_t *r,
 
 #if (NGX_HTTP_CACHE)
 
-    if (u->cacheable) {
+    if (u->cacheable && r->cache) {
         time_t  valid;
 
         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,