mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-26 16:30:39 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

merge r2950, r2951:

Browse Source 
cache related fixes:

*) fix building --without-http-cache, broken in r2945
*) fix ./configure error message
This commit is contained in:
Igor Sysoev 2009-06-22 09:29:10 +00:00
parent 8a6c783ac7
commit d49e7d869c
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
auto/lib/md5/conf
View File

@ -100,9 +100,9 @@ cat << END
$0: error: the HTTP cache module requires md5 functions $0: error: the HTTP cache module requires md5 functions
from OpenSSL library. You can either disable the module by using from OpenSSL library. You can either disable the module by using
--without-http_cache option, or install the OpenSSL library into the system, --without-http-cache option, or install the OpenSSL library into the system,
or build the OpenSSL library statically from the source with nginx by using or build the OpenSSL library statically from the source with nginx by using
--with-openssl=<path> option. --with-http_ssl_module --with-openssl=<path> options.
END END
exit 1 exit 1

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 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; 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; conf->hide_headers_hash = prev->hide_headers_hash;
if (conf->hide_headers_hash.buckets 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; return NGX_OK;
} }