mirror of
https://github.com/nginx/nginx.git
synced 2025-01-08 23:23:02 -06:00
fix case when two directives
proxy_pass http://backend; proxy_pass https://backend; both use one port - 80 or 443, that was defined first.
This commit is contained in:
parent
5bb2112c27
commit
32b787560a
@ -3209,6 +3209,12 @@ ngx_http_upstream_add(ngx_conf_t *cf, ngx_url_t *u, ngx_uint_t flags)
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (uscfp[i]->default_port && u->default_port
|
||||||
|
&& uscfp[i]->default_port != u->default_port)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
return uscfp[i];
|
return uscfp[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user