Mercurial > hg > nginx

changeset 2949:fe484c0be7c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix building --without-http-cache, broken in r2930
author Igor Sysoev <igor@sysoev.ru>
date Mon, 15 Jun 2009 14:25:08 +0000
parents a955ccdf97f7
children 3ac5032f5981
files src/http/modules/ngx_http_proxy_module.c src/http/ngx_http_upstream.c
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
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;
     }
--- 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->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;
         }