diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-06-15 14:25:08 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-06-15 14:25:08 +0000 |
| commit | 0775182312de6b279bb99cc23d644382db04870a (patch) | |
| tree | 4dc6719eeac72b44312b6f4bc5fe985e95d43344 | |
| parent | dfd4e0a3034080b5a9ba77b0683ed37b0b35a3fe (diff) | |
| download | nginx-0775182312de6b279bb99cc23d644382db04870a.tar.gz nginx-0775182312de6b279bb99cc23d644382db04870a.tar.bz2 | |
fix building --without-http-cache, broken in r2930
| -rw-r--r-- | src/http/modules/ngx_http_proxy_module.c | 5 | ||||
| -rw-r--r-- | src/http/ngx_http_upstream.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c index f0aadb402..f2d939ed7 100644 --- 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 *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; } diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index 87df57169..19b6fb8c7 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; } |