Mercurial > hg > nginx
comparison src/http/modules/ngx_http_proxy_module.c @ 2961:31526449835f stable-0.7
merge r2950, r2951:
cache related fixes:
*) fix building --without-http-cache, broken in r2945
*) fix ./configure error message
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 22 Jun 2009 09:29:10 +0000 |
parents | f892042956e3 |
children | 2efa8d2fcde1 |
comparison
equal
deleted
inserted
replaced
2960:7282f9d25521 | 2961:31526449835f |
---|---|
2341 conf->headers_set_hash = prev->headers_set_hash; | 2341 conf->headers_set_hash = prev->headers_set_hash; |
2342 conf->headers_source = prev->headers_source; | 2342 conf->headers_source = prev->headers_source; |
2343 } | 2343 } |
2344 | 2344 |
2345 if (conf->headers_set_hash.buckets | 2345 if (conf->headers_set_hash.buckets |
2346 && ((conf->upstream.cache == NULL) == (prev->upstream.cache == NULL))) | 2346 #if (NGX_HTTP_CACHE) |
2347 && ((conf->upstream.cache == NULL) == (prev->upstream.cache == NULL)) | |
2348 #endif | |
2349 ) | |
2347 { | 2350 { |
2348 return NGX_OK; | 2351 return NGX_OK; |
2349 } | 2352 } |
2350 | 2353 |
2351 | 2354 |