]> git.kaiwu.me - nginx.git/commitdiff
Fixed PROXY protocol on IPv6 sockets (ticket #858).
authorMaxim Dounin <mdounin@mdounin.ru>
Thu, 17 Dec 2015 13:39:02 +0000 (16:39 +0300)
committerMaxim Dounin <mdounin@mdounin.ru>
Thu, 17 Dec 2015 13:39:02 +0000 (16:39 +0300)
src/http/ngx_http.c

index d09e3f0ad6bc502de680c50459bd582f9335dd6d..64af447609736037d1b1b291701e9239618b0e60 100644 (file)
@@ -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