# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1240602969 0
# Node ID 9ba1bee1b1e46c0d8e9d5b97940fca44efc61337
# Parent  2d82d3cfbfa018ca72ecef07fb98828719e404cc
merge SSL context inside "if" block

diff -r 2d82d3cfbfa0 -r 9ba1bee1b1e4 src/http/modules/ngx_http_proxy_module.c
--- a/src/http/modules/ngx_http_proxy_module.c	Fri Apr 24 15:50:51 2009 +0000
+++ b/src/http/modules/ngx_http_proxy_module.c	Fri Apr 24 19:56:09 2009 +0000
@@ -2192,6 +2192,12 @@
         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);