annotate docs/html/index.html @ 6785:d1d0dd69a419

Upstream: added the ngx_http_upstream_resolved_t.name field. This fixes inconsistency in what is stored in the "host" field. Normally it would contain the "host" part of the parsed URL (e.g., proxy_pass with variables), but for the case of an implicit upstream specified with literal address it contained the text representation of the socket address (that is, host including port for IP). Now the "host" field always contains the "host" part of the URL, while the text representation of the socket address is stored in the newly added "name" field. The ngx_http_upstream_create_round_robin_peer() function was modified accordingly in a way to be compatible with the code that does not know about the new "name" field. The "stream" code was similarly modified except for not adding compatibility in ngx_stream_upstream_create_round_robin_peer(). This change is also a prerequisite for the next change.
author Ruslan Ermilov <ru@nginx.com>
date Mon, 31 Oct 2016 18:33:33 +0300
parents ed470a7bf7fd
children 67c68cd973b8
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4834
ed470a7bf7fd Improved welcome page.
Valentin Bartenev <vbart@nginx.com>
parents: 450
diff changeset
1 <!DOCTYPE html>
450
551102312e19 nginx-0.1.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
2 <html>
551102312e19 nginx-0.1.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
3 <head>
551102312e19 nginx-0.1.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
4 <title>Welcome to nginx!</title>
4834
ed470a7bf7fd Improved welcome page.
Valentin Bartenev <vbart@nginx.com>
parents: 450
diff changeset
5 <style>
ed470a7bf7fd Improved welcome page.
Valentin Bartenev <vbart@nginx.com>
parents: 450
diff changeset
6 body {
ed470a7bf7fd Improved welcome page.
Valentin Bartenev <vbart@nginx.com>
parents: 450
diff changeset
7 width: 35em;
ed470a7bf7fd Improved welcome page.
Valentin Bartenev <vbart@nginx.com>
parents: 450
diff changeset
8 margin: 0 auto;
ed470a7bf7fd Improved welcome page.
Valentin Bartenev <vbart@nginx.com>
parents: 450
diff changeset
9 font-family: Tahoma, Verdana, Arial, sans-serif;
ed470a7bf7fd Improved welcome page.
Valentin Bartenev <vbart@nginx.com>
parents: 450
diff changeset
10 }
ed470a7bf7fd Improved welcome page.
Valentin Bartenev <vbart@nginx.com>
parents: 450
diff changeset
11 </style>
450
551102312e19 nginx-0.1.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
12 </head>
4834
ed470a7bf7fd Improved welcome page.
Valentin Bartenev <vbart@nginx.com>
parents: 450
diff changeset
13 <body>
ed470a7bf7fd Improved welcome page.
Valentin Bartenev <vbart@nginx.com>
parents: 450
diff changeset
14 <h1>Welcome to nginx!</h1>
ed470a7bf7fd Improved welcome page.
Valentin Bartenev <vbart@nginx.com>
parents: 450
diff changeset
15 <p>If you see this page, the nginx web server is successfully installed and
ed470a7bf7fd Improved welcome page.
Valentin Bartenev <vbart@nginx.com>
parents: 450
diff changeset
16 working. Further configuration is required.</p>
ed470a7bf7fd Improved welcome page.
Valentin Bartenev <vbart@nginx.com>
parents: 450
diff changeset
17
ed470a7bf7fd Improved welcome page.
Valentin Bartenev <vbart@nginx.com>
parents: 450
diff changeset
18 <p>For online documentation and support please refer to
ed470a7bf7fd Improved welcome page.
Valentin Bartenev <vbart@nginx.com>
parents: 450
diff changeset
19 <a href="http://nginx.org/">nginx.org</a>.<br/>
ed470a7bf7fd Improved welcome page.
Valentin Bartenev <vbart@nginx.com>
parents: 450
diff changeset
20 Commercial support is available at
ed470a7bf7fd Improved welcome page.
Valentin Bartenev <vbart@nginx.com>
parents: 450
diff changeset
21 <a href="http://nginx.com/">nginx.com</a>.</p>
ed470a7bf7fd Improved welcome page.
Valentin Bartenev <vbart@nginx.com>
parents: 450
diff changeset
22
ed470a7bf7fd Improved welcome page.
Valentin Bartenev <vbart@nginx.com>
parents: 450
diff changeset
23 <p><em>Thank you for using nginx.</em></p>
450
551102312e19 nginx-0.1.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
24 </body>
551102312e19 nginx-0.1.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
25 </html>