mirror of
https://github.com/nginx/nginx.git
synced 2025-02-25 18:55:26 -06:00
Upstream: removed unnecessary condition in proxy_eval() and friends.
The first condition added in d3454e719bbb should have just replaced the second one.
This commit is contained in:
parent
df9b2b9011
commit
4e1720b0a2
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user