From d49e7d869c1608e8f001967add48833cedd4038c Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Mon, 22 Jun 2009 09:29:10 +0000
Subject: merge r2950, r2951:

cache related fixes:

*) fix building --without-http-cache, broken in r2945
*) fix ./configure error message
---
 src/http/ngx_http_upstream.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/http/ngx_http_upstream.c')

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 75f3641c4..67ae1bc1c 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -4086,7 +4086,10 @@ ngx_http_upstream_hide_headers_hash(ngx_conf_t *cf,
         conf->hide_headers_hash = prev->hide_headers_hash;
 
         if (conf->hide_headers_hash.buckets
-            && ((conf->cache == NULL) == (prev->cache == NULL)))
+#if (NGX_HTTP_CACHE)
+            && ((conf->cache == NULL) == (prev->cache == NULL))
+#endif
+           )
         {
             return NGX_OK;
         }
-- 
cgit