Mercurial > hg > nginx-quic

comparison src/http/modules/ngx_http_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 ca27074f8f0f
children d1d0dd69a419
comparison
equal deleted inserted replaced
6783:9027991e2f37 6784:1af120241cde
1006 u->resolved = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_resolved_t)); 1006 u->resolved = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_resolved_t));
1007 if (u->resolved == NULL) { 1007 if (u->resolved == NULL) {
1008 return NGX_ERROR; 1008 return NGX_ERROR;
1009 } 1009 }
1010 1010
1011 if (url.addrs && url.addrs[0].sockaddr) { 1011 if (url.addrs) {
1012 u->resolved->sockaddr = url.addrs[0].sockaddr; 1012 u->resolved->sockaddr = url.addrs[0].sockaddr;
1013 u->resolved->socklen = url.addrs[0].socklen; 1013 u->resolved->socklen = url.addrs[0].socklen;
1014 u->resolved->naddrs = 1; 1014 u->resolved->naddrs = 1;
1015 u->resolved->host = url.addrs[0].name; 1015 u->resolved->host = url.addrs[0].name;
1016 1016