Mercurial > hg > nginx
changeset 2865:e8f271979e0a stable-0.6
r2754 merge:
merge SSL context inside "if" block
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 18 May 2009 16:13:02 +0000 |
parents | 967ad993a4f8 |
children | 1804da35f853 |
files | src/http/modules/ngx_http_proxy_module.c |
diffstat | 1 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_proxy_module.c +++ b/src/http/modules/ngx_http_proxy_module.c @@ -1899,6 +1899,12 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t conf->proxy_values = prev->proxy_values; } +#if (NGX_HTTP_SSL) + if (conf->upstream.ssl == NULL) { + conf->upstream.ssl = prev->upstream.ssl; + } +#endif + ngx_conf_merge_uint_value(conf->headers_hash_max_size, prev->headers_hash_max_size, 512);