Merge proxy_protocol setting of listen directives.
It's now enough to specify proxy_protocol option in one listen directive to enable it in all servers listening on the same address/port. Previously, the setting from the first directive was always used.
This commit is contained in:
parent
dcdd591615
commit
e084afb726
|
@ -1220,7 +1220,7 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
|
|||
{
|
||||
u_char *p;
|
||||
size_t len, off;
|
||||
ngx_uint_t i, default_server;
|
||||
ngx_uint_t i, default_server, proxy_protocol;
|
||||
struct sockaddr *sa;
|
||||
ngx_http_conf_addr_t *addr;
|
||||
#if (NGX_HAVE_UNIX_DOMAIN)
|
||||
|
@ -1281,6 +1281,8 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
|
|||
/* preserve default_server bit during listen options overwriting */
|
||||
default_server = addr[i].opt.default_server;
|
||||
|
||||
proxy_protocol = lsopt->proxy_protocol || addr[i].opt.proxy_protocol;
|
||||
|
||||
#if (NGX_HTTP_SSL)
|
||||
ssl = lsopt->ssl || addr[i].opt.ssl;
|
||||
#endif
|
||||
|
@ -1314,6 +1316,7 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
|
|||
}
|
||||
|
||||
addr[i].opt.default_server = default_server;
|
||||
addr[i].opt.proxy_protocol = proxy_protocol;
|
||||
#if (NGX_HTTP_SSL)
|
||||
addr[i].opt.ssl = ssl;
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue