r2754 merge:

merge SSL context inside "if" block
2009-05-18 16:13:02 +00:00 · 2009-05-18 16:13:02 +00:00 · 394b5de7a4
parent 4764c735ef
commit 394b5de7a4
1 changed files with 6 additions and 0 deletions
--- 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);