Mercurial > hg > nginx

diff src/http/modules/ngx_http_proxy_module.c @ 2961:31526449835f stable-0.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge r2950, r2951: cache related fixes: *) fix building --without-http-cache, broken in r2945 *) fix ./configure error message
author Igor Sysoev <igor@sysoev.ru>
date Mon, 22 Jun 2009 09:29:10 +0000
parents f892042956e3
children 2efa8d2fcde1
line wrap: on
line diff
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -2343,7 +2343,10 @@ ngx_http_proxy_merge_headers(ngx_conf_t 
     }
 
     if (conf->headers_set_hash.buckets
-        && ((conf->upstream.cache == NULL) == (prev->upstream.cache == NULL)))
+#if (NGX_HTTP_CACHE)
+        && ((conf->upstream.cache == NULL) == (prev->upstream.cache == NULL))
+#endif
+       )
     {
         return NGX_OK;
     }