IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-18 21:23:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Upstream: removed unnecessary condition in proxy_eval() and friends.

Browse Source 
The first condition added in d3454e719bbb should have just replaced
the second one.
This commit is contained in:
Ruslan Ermilov 2016-10-31 18:33:31 +03:00
parent df9b2b9011
commit 4e1720b0a2
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/http/modules/ngx_http_fastcgi_module.c
View File

@ -766,7 +766,7 @@ ngx_http_fastcgi_eval(ngx_http_request_t *r, ngx_http_fastcgi_loc_conf_t *flcf)
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;

2
src/http/modules/ngx_http_proxy_module.c
View File

@ -1008,7 +1008,7 @@ ngx_http_proxy_eval(ngx_http_request_t *r, ngx_http_proxy_ctx_t *ctx,
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;

2
src/http/modules/ngx_http_scgi_module.c
View File

@ -562,7 +562,7 @@ ngx_http_scgi_eval(ngx_http_request_t *r, ngx_http_scgi_loc_conf_t * scf)
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;

2
src/http/modules/ngx_http_uwsgi_module.c
View File

@ -764,7 +764,7 @@ ngx_http_uwsgi_eval(ngx_http_request_t *r, ngx_http_uwsgi_loc_conf_t * uwcf)
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;

2
src/stream/ngx_stream_proxy_module.c
View File

@ -578,7 +578,7 @@ ngx_stream_proxy_eval(ngx_stream_session_t *s,
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;