Mercurial > hg > nginx
annotate 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 |
rev | line source |
---|---|
681 | 1 /* XPM */ |
2 static char * nginx_xpm[] = { | |
3 "16 16 2 2", | |
4 /* colors */ | |
5 " c none", | |
6 "GG c #009900", | |
7 /* pixels */ | |
8 " ", | |
9 " GGGGGGGGGGGGGGGG ", | |
10 " GGGGGGGGGGGGGGGG ", | |
11 " GGGGGGGGGGGGGGGGGGGG ", | |
12 " GGGGGG GGGGGG ", | |
13 " GGGGGG GGGGGG ", | |
14 " GGGGGG ", | |
15 " GGGGGG GGGGGGGGGGGGGGGG ", | |
16 " GGGGGG GGGGGGGGGGGGGGGGGG ", | |
17 " GGGGGG GGGGGGGGGGGGGG ", | |
18 " GGGGGG GGGGGG ", | |
19 " GGGGGG GGGGGG ", | |
20 " GGGGGGGGGGGGGGGGGGGG ", | |
21 " GGGGGGGGGGGGGGGG ", | |
22 " GGGGGGGGGGGGGGGG ", | |
23 " " | |
754
4ac89c5aa10d
style fix: remove trailing spaces
Igor Sysoev <igor@sysoev.ru>
parents:
681
diff
changeset
|
24 }; |