diff options
author | Igor Sysoev <igor@sysoev.ru> | 2009-05-18 16:13:02 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2009-05-18 16:13:02 +0000 |
commit | 0e7ed23cec70cec3e6bce9a90e2f45708b658e46 (patch) | |
tree | 923f4b8bf25ddc6bb327d540472551a1253a8662 | |
parent | 2d7195bdb711390302eec115744aae289a231314 (diff) | |
download | nginx-0e7ed23cec70cec3e6bce9a90e2f45708b658e46.tar.gz |
r2754 merge:
merge SSL context inside "if" block
-rw-r--r-- | src/http/modules/ngx_http_proxy_module.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c index f5c6ceeaf..23e07d324 100644 --- 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 *cf, void *parent, void *child) 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); |