From: Igor Sysoev <igor@sysoev.ru>
Date: Fri, 24 Apr 2009 19:56:09 +0000 (+0000)
Subject: merge SSL context inside "if" block
X-Git-Tag: release-0.7.53~7
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=22380569de323d346788055c49b2112e2a51c102;p=nginx.git

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
index 60182d603..628b32d4a 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -2192,6 +2192,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);