IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-22 15:13:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Igor Sysoev 2009-06-15 14:25:08 +00:00
parent dfd4e0a303
commit 0775182312
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/http/modules/ngx_http_proxy_module.c
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;
}

5
src/http/ngx_http_upstream.c
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;
}