Mercurial > hg > nginx
comparison src/http/modules/ngx_http_proxy_module.c @ 2753:9ba1bee1b1e4
merge SSL context inside "if" block
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Fri, 24 Apr 2009 19:56:09 +0000 |
parents | d5896f6608e8 |
children | c2230102df6f |
comparison
equal
deleted
inserted
replaced
2752:2d82d3cfbfa0 | 2753:9ba1bee1b1e4 |
---|---|
2190 if (prev->proxy_lengths) { | 2190 if (prev->proxy_lengths) { |
2191 conf->proxy_lengths = prev->proxy_lengths; | 2191 conf->proxy_lengths = prev->proxy_lengths; |
2192 conf->proxy_values = prev->proxy_values; | 2192 conf->proxy_values = prev->proxy_values; |
2193 } | 2193 } |
2194 | 2194 |
2195 #if (NGX_HTTP_SSL) | |
2196 if (conf->upstream.ssl == NULL) { | |
2197 conf->upstream.ssl = prev->upstream.ssl; | |
2198 } | |
2199 #endif | |
2200 | |
2195 ngx_conf_merge_uint_value(conf->headers_hash_max_size, | 2201 ngx_conf_merge_uint_value(conf->headers_hash_max_size, |
2196 prev->headers_hash_max_size, 512); | 2202 prev->headers_hash_max_size, 512); |
2197 | 2203 |
2198 ngx_conf_merge_uint_value(conf->headers_hash_bucket_size, | 2204 ngx_conf_merge_uint_value(conf->headers_hash_bucket_size, |
2199 prev->headers_hash_bucket_size, 64); | 2205 prev->headers_hash_bucket_size, 64); |