Mercurial > hg > nginx
changeset 6338:f32d073b83e1 stable-1.8
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.
author | Roman Arutyunyan <arut@nginx.com> |
---|---|
date | Fri, 24 Apr 2015 10:54:06 +0300 |
parents | 5a6dd26567ee |
children | 67422a0a8ed2 |
files | src/http/ngx_http.c |
diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http.c Mon Jan 25 19:32:58 2016 +0300 +++ b/src/http/ngx_http.c Fri Apr 24 10:54:06 2015 +0300 @@ -1220,7 +1220,7 @@ { 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 @@ /* 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 @@ } addr[i].opt.default_server = default_server; + addr[i].opt.proxy_protocol = proxy_protocol; #if (NGX_HTTP_SSL) addr[i].opt.ssl = ssl; #endif