Mercurial > hg > nginx
comparison src/http/ngx_http.c @ 6331:ceeb1edb3018
Fixed PROXY protocol on IPv6 sockets (ticket #858).
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Thu, 17 Dec 2015 16:39:02 +0300 |
parents | 257b51c37c5a |
children | 0f203a2af17c |
comparison
equal
deleted
inserted
replaced
6330:fef42206bae7 | 6331:ceeb1edb3018 |
---|---|
1925 addrs6[i].conf.ssl = addr[i].opt.ssl; | 1925 addrs6[i].conf.ssl = addr[i].opt.ssl; |
1926 #endif | 1926 #endif |
1927 #if (NGX_HTTP_V2) | 1927 #if (NGX_HTTP_V2) |
1928 addrs6[i].conf.http2 = addr[i].opt.http2; | 1928 addrs6[i].conf.http2 = addr[i].opt.http2; |
1929 #endif | 1929 #endif |
1930 addrs6[i].conf.proxy_protocol = addr[i].opt.proxy_protocol; | |
1930 | 1931 |
1931 if (addr[i].hash.buckets == NULL | 1932 if (addr[i].hash.buckets == NULL |
1932 && (addr[i].wc_head == NULL | 1933 && (addr[i].wc_head == NULL |
1933 || addr[i].wc_head->hash.buckets == NULL) | 1934 || addr[i].wc_head->hash.buckets == NULL) |
1934 && (addr[i].wc_tail == NULL | 1935 && (addr[i].wc_tail == NULL |