Mercurial > hg > nginx
changeset 6784:1af120241cde
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 | 9027991e2f37 |
children | d1d0dd69a419 |
files | src/http/modules/ngx_http_fastcgi_module.c src/http/modules/ngx_http_proxy_module.c src/http/modules/ngx_http_scgi_module.c src/http/modules/ngx_http_uwsgi_module.c src/stream/ngx_stream_proxy_module.c |
diffstat | 5 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_fastcgi_module.c Mon Oct 31 16:33:02 2016 +0300 +++ b/src/http/modules/ngx_http_fastcgi_module.c Mon Oct 31 18:33:31 2016 +0300 @@ -766,7 +766,7 @@ return NGX_ERROR; } - if (url.addrs && url.addrs[0].sockaddr) { + if (url.addrs) { u->resolved->sockaddr = url.addrs[0].sockaddr; u->resolved->socklen = url.addrs[0].socklen; u->resolved->naddrs = 1;
--- a/src/http/modules/ngx_http_proxy_module.c Mon Oct 31 16:33:02 2016 +0300 +++ b/src/http/modules/ngx_http_proxy_module.c Mon Oct 31 18:33:31 2016 +0300 @@ -1008,7 +1008,7 @@ return NGX_ERROR; } - if (url.addrs && url.addrs[0].sockaddr) { + if (url.addrs) { u->resolved->sockaddr = url.addrs[0].sockaddr; u->resolved->socklen = url.addrs[0].socklen; u->resolved->naddrs = 1;
--- a/src/http/modules/ngx_http_scgi_module.c Mon Oct 31 16:33:02 2016 +0300 +++ b/src/http/modules/ngx_http_scgi_module.c Mon Oct 31 18:33:31 2016 +0300 @@ -562,7 +562,7 @@ return NGX_ERROR; } - if (url.addrs && url.addrs[0].sockaddr) { + if (url.addrs) { u->resolved->sockaddr = url.addrs[0].sockaddr; u->resolved->socklen = url.addrs[0].socklen; u->resolved->naddrs = 1;
--- a/src/http/modules/ngx_http_uwsgi_module.c Mon Oct 31 16:33:02 2016 +0300 +++ b/src/http/modules/ngx_http_uwsgi_module.c Mon Oct 31 18:33:31 2016 +0300 @@ -764,7 +764,7 @@ return NGX_ERROR; } - if (url.addrs && url.addrs[0].sockaddr) { + if (url.addrs) { u->resolved->sockaddr = url.addrs[0].sockaddr; u->resolved->socklen = url.addrs[0].socklen; u->resolved->naddrs = 1;
--- a/src/stream/ngx_stream_proxy_module.c Mon Oct 31 16:33:02 2016 +0300 +++ b/src/stream/ngx_stream_proxy_module.c Mon Oct 31 18:33:31 2016 +0300 @@ -578,7 +578,7 @@ return NGX_ERROR; } - if (url.addrs && url.addrs[0].sockaddr) { + if (url.addrs) { u->resolved->sockaddr = url.addrs[0].sockaddr; u->resolved->socklen = url.addrs[0].socklen; u->resolved->naddrs = 1;