diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2014-12-09 18:21:55 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2014-12-09 18:21:55 +0300 |
| commit | c863e1b3b56e647b9cc9c9aeed53a9ab309194ed (patch) | |
| tree | a93d708bb96b5183047dabcb367a0deeada2a631 /src/http/modules/ngx_http_uwsgi_module.c | |
| parent | 88ed2d39afcc00d46a640de542f6b491413e38d6 (diff) | |
| download | nginx-c863e1b3b56e647b9cc9c9aeed53a9ab309194ed.tar.gz nginx-c863e1b3b56e647b9cc9c9aeed53a9ab309194ed.zip | |
Upstream: inheritance of proxy_pass and friends (ticket #645).
Instead of independant inheritance of conf->upstream.upstream (proxy_pass
without variables) and conf->proxy_lengths (proxy_pass with variables)
we now test them both and inherit only if neither is set. Additionally,
SSL context is also inherited only in this case now.
Based on the patch by Alexey Radkov.
Diffstat (limited to 'src/http/modules/ngx_http_uwsgi_module.c')
| -rw-r--r-- | src/http/modules/ngx_http_uwsgi_module.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/http/modules/ngx_http_uwsgi_module.c b/src/http/modules/ngx_http_uwsgi_module.c index d12fbdf7b..0dbcbf16a 100644 --- a/src/http/modules/ngx_http_uwsgi_module.c +++ b/src/http/modules/ngx_http_uwsgi_module.c @@ -1683,10 +1683,6 @@ ngx_http_uwsgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) return NGX_CONF_ERROR; } - if (conf->upstream.ssl == NULL) { - conf->upstream.ssl = prev->upstream.ssl; - } - #endif ngx_conf_merge_str_value(conf->uwsgi_string, prev->uwsgi_string, ""); @@ -1702,13 +1698,15 @@ ngx_http_uwsgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) return NGX_CONF_ERROR; } - if (conf->upstream.upstream == NULL) { + if (conf->upstream.upstream == NULL && conf->uwsgi_lengths == NULL) { conf->upstream.upstream = prev->upstream.upstream; - } - if (conf->uwsgi_lengths == NULL) { conf->uwsgi_lengths = prev->uwsgi_lengths; conf->uwsgi_values = prev->uwsgi_values; + +#if (NGX_HTTP_SSL) + conf->upstream.ssl = prev->upstream.ssl; +#endif } if (conf->upstream.upstream || conf->uwsgi_lengths) { |