Mercurial > hg > nginx

comparison src/stream/ngx_stream_proxy_module.c @ 6784:1af120241cde

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upstream: removed unnecessary condition in proxy_eval() and friends. The first condition added in d3454e719bbb should have just replaced the second one.
author Ruslan Ermilov <ru@nginx.com>
date Mon, 31 Oct 2016 18:33:31 +0300
parents 563a1ee345a4
children d1d0dd69a419
comparison
equal deleted inserted replaced
6783:9027991e2f37 6784:1af120241cde
576 sizeof(ngx_stream_upstream_resolved_t)); 576 sizeof(ngx_stream_upstream_resolved_t));
577 if (u->resolved == NULL) { 577 if (u->resolved == NULL) {
578 return NGX_ERROR; 578 return NGX_ERROR;
579 } 579 }
580 580
581 if (url.addrs && url.addrs[0].sockaddr) { 581 if (url.addrs) {
582 u->resolved->sockaddr = url.addrs[0].sockaddr; 582 u->resolved->sockaddr = url.addrs[0].sockaddr;
583 u->resolved->socklen = url.addrs[0].socklen; 583 u->resolved->socklen = url.addrs[0].socklen;
584 u->resolved->naddrs = 1; 584 u->resolved->naddrs = 1;
585 u->resolved->host = url.addrs[0].name; 585 u->resolved->host = url.addrs[0].name;
586 586