fix building --without-http-cache, broken in r2930

This commit is contained in:
Igor Sysoev committed 2009-06-15 14:25:08 +00:00
1 parent dfd4e0a303
commit 0775182312
2 files changed
+8 -2

No files matched your search

+4 -1
View File
@@ -2343,7 +2343,10 @@ ngx_http_proxy_merge_headers(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *conf,
}
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;
}
+4 -1
View File
@@ -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;
}