From: Maxim Dounin <mdounin@mdounin.ru>
Date: Thu, 17 Dec 2015 13:39:02 +0000 (+0300)
Subject: Fixed PROXY protocol on IPv6 sockets (ticket #858).
X-Git-Tag: release-1.9.10~12
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=9973e3694447cc4814f46b02b45dea590bbc68ac;p=nginx.git

Fixed PROXY protocol on IPv6 sockets (ticket #858).
---

diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index d09e3f0ad..64af44760 100644
--- 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_http_port_t *hport,
 #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