Mercurial > hg > nginx
view src/os/win32/nginx_icon16.xpm @ 6787:640e1e778de6
Upstream: consistently initialize explicit upstreams.
When an upstream{} block follows a proxy_pass reference to it,
such an upstream inherited port and default_port settings from
proxy_pass. This was different from when they came in another
order (see ticket #1059). Explicit upstreams should not have
port and default_port in any case.
This fixes the following case:
server { location / { proxy_pass http://u; } ... }
upstream u { server 127.0.0.1; }
server { location / { proxy_pass https://u; } ... }
but not the following:
server { location / { proxy_pass http://u; } ... }
server { location / { proxy_pass https://u; } ... }
upstream u { server 127.0.0.1; }
| author | Ruslan Ermilov <ru@nginx.com> |
|---|---|
| date | Mon, 17 Oct 2016 14:14:02 +0300 |
| parents | 4ac89c5aa10d |
| children |
line wrap: on
line source
/* XPM */ static char * nginx_xpm[] = { "16 16 2 2", /* colors */ " c none", "GG c #009900", /* pixels */ " ", " GGGGGGGGGGGGGGGG ", " GGGGGGGGGGGGGGGG ", " GGGGGGGGGGGGGGGGGGGG ", " GGGGGG GGGGGG ", " GGGGGG GGGGGG ", " GGGGGG ", " GGGGGG GGGGGGGGGGGGGGGG ", " GGGGGG GGGGGGGGGGGGGGGGGG ", " GGGGGG GGGGGGGGGGGGGG ", " GGGGGG GGGGGG ", " GGGGGG GGGGGG ", " GGGGGGGGGGGGGGGGGGGG ", " GGGGGGGGGGGGGGGG ", " GGGGGGGGGGGGGGGG ", " " };