diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-04-24 19:56:09 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-04-24 19:56:09 +0000 |
| commit | 22380569de323d346788055c49b2112e2a51c102 (patch) | |
| tree | 977cc8a4de4b457ef334be671b4d8bc93697cf29 /src | |
| parent | c27497da921744ba1d23f0d3ddc50b8684741c48 (diff) | |
| download | nginx-22380569de323d346788055c49b2112e2a51c102.tar.gz nginx-22380569de323d346788055c49b2112e2a51c102.tar.bz2 | |
merge SSL context inside "if" block
Diffstat (limited to '')
| -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 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); |