Mercurial > hg > nginx

comparison src/stream/ngx_stream.c @ 6680:7357abd1fa8c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Stream: the "proxy_protocol" parameter of the "listen" directive.
author Dmitry Volyntsev <xeioex@nginx.com>
date Tue, 06 Sep 2016 21:28:16 +0300
parents c70b7f4537e1
children 56fc55e32f23
comparison
equal deleted inserted replaced
6679:40e8ce405859 6680:7357abd1fa8c
453 453
454 addrs[i].conf.ctx = addr[i].opt.ctx; 454 addrs[i].conf.ctx = addr[i].opt.ctx;
455 #if (NGX_STREAM_SSL) 455 #if (NGX_STREAM_SSL)
456 addrs[i].conf.ssl = addr[i].opt.ssl; 456 addrs[i].conf.ssl = addr[i].opt.ssl;
457 #endif 457 #endif
458 addrs[i].conf.proxy_protocol = addr[i].opt.proxy_protocol;
458 459
459 len = ngx_sock_ntop(&addr[i].opt.sockaddr.sockaddr, addr[i].opt.socklen, 460 len = ngx_sock_ntop(&addr[i].opt.sockaddr.sockaddr, addr[i].opt.socklen,
460 buf, NGX_SOCKADDR_STRLEN, 1); 461 buf, NGX_SOCKADDR_STRLEN, 1);
461 462
462 p = ngx_pnalloc(cf->pool, len); 463 p = ngx_pnalloc(cf->pool, len);
502 503
503 addrs6[i].conf.ctx = addr[i].opt.ctx; 504 addrs6[i].conf.ctx = addr[i].opt.ctx;
504 #if (NGX_STREAM_SSL) 505 #if (NGX_STREAM_SSL)
505 addrs6[i].conf.ssl = addr[i].opt.ssl; 506 addrs6[i].conf.ssl = addr[i].opt.ssl;
506 #endif 507 #endif
508 addrs6[i].conf.proxy_protocol = addr[i].opt.proxy_protocol;
507 509
508 len = ngx_sock_ntop(&addr[i].opt.sockaddr.sockaddr, addr[i].opt.socklen, 510 len = ngx_sock_ntop(&addr[i].opt.sockaddr.sockaddr, addr[i].opt.socklen,
509 buf, NGX_SOCKADDR_STRLEN, 1); 511 buf, NGX_SOCKADDR_STRLEN, 1);
510 512
511 p = ngx_pnalloc(cf->pool, len); 513 p = ngx_pnalloc(cf->pool, len);