# HG changeset patch
# User Maxim Dounin <mdounin@mdounin.ru>
# Date 1450359542 -10800
# Node ID ceeb1edb3018dc9ae7b83476c5dc0a01887740f2
# Parent  fef42206bae7c10df01ed37147cf770291f69a05
Fixed PROXY protocol on IPv6 sockets (ticket #858).

diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -1927,6 +1927,7 @@ ngx_http_add_addrs6(ngx_conf_t *cf, ngx_
 #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