diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-06-22 09:29:10 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-06-22 09:29:10 +0000 |
| commit | d49e7d869c1608e8f001967add48833cedd4038c (patch) | |
| tree | f3a566fa255a15f7303d495a06538219edd530f3 /src | |
| parent | 8a6c783ac7c6e7372e1a45eaf74448cedf4fbb24 (diff) | |
| download | nginx-d49e7d869c1608e8f001967add48833cedd4038c.tar.gz nginx-d49e7d869c1608e8f001967add48833cedd4038c.tar.bz2 | |
merge r2950, r2951:
cache related fixes:
*) fix building --without-http-cache, broken in r2945
*) fix ./configure error message
Diffstat (limited to 'src')
| -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 6e2d230b2..96bd89b6d 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 75f3641c4..67ae1bc1c 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; } |