Mercurial > hg > nginx

changeset 6331:ceeb1edb3018

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed PROXY protocol on IPv6 sockets (ticket #858).
author Maxim Dounin <mdounin@mdounin.ru>
date Thu, 17 Dec 2015 16:39:02 +0300
parents fef42206bae7
children 78b4e10b4367
files src/http/ngx_http.c
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/ngx_http.c	Thu Dec 17 16:38:51 2015 +0300
+++ b/src/http/ngx_http.c	Thu Dec 17 16:39:02 2015 +0300
@@ -1927,6 +1927,7 @@
 #if (NGX_HTTP_V2)
         addrs6[i].conf.http2 = addr[i].opt.http2;
 #endif
+        addrs6[i].conf.proxy_protocol = addr[i].opt.proxy_protocol;
 
         if (addr[i].hash.buckets == NULL
             && (addr[i].wc_head == NULL