Mercurial > hg > nginx

comparison src/http/modules/ngx_http_scgi_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 20eb4587225b
children d1d0dd69a419
comparison
equal deleted inserted replaced
6783:9027991e2f37 6784:1af120241cde
560 u->resolved = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_resolved_t)); 560 u->resolved = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_resolved_t));
561 if (u->resolved == NULL) { 561 if (u->resolved == NULL) {
562 return NGX_ERROR; 562 return NGX_ERROR;
563 } 563 }
564 564
565 if (url.addrs && url.addrs[0].sockaddr) { 565 if (url.addrs) {
566 u->resolved->sockaddr = url.addrs[0].sockaddr; 566 u->resolved->sockaddr = url.addrs[0].sockaddr;
567 u->resolved->socklen = url.addrs[0].socklen; 567 u->resolved->socklen = url.addrs[0].socklen;
568 u->resolved->naddrs = 1; 568 u->resolved->naddrs = 1;
569 u->resolved->host = url.addrs[0].name; 569 u->resolved->host = url.addrs[0].name;
570 570