# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1242663182 0
# Node ID e8f271979e0ab9df3f291f7e9c5a85b295c92c7c
# Parent  967ad993a4f8370d96395cbc1d40a8c5ebab8e58
r2754 merge:

merge SSL context inside "if" block

diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
--- 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);