annotate docs/html/50x.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 b5ba6f22a0fc
children 1cd63ae46243
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4840
b5ba6f22a0fc Improved 50x error page.
Valentin Bartenev <vbart@nginx.com>
parents: 663
diff changeset
1 <!DOCTYPE html>
657
400711951595 nginx-0.3.50-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
2 <html>
400711951595 nginx-0.3.50-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
3 <head>
4840
b5ba6f22a0fc Improved 50x error page.
Valentin Bartenev <vbart@nginx.com>
parents: 663
diff changeset
4 <title>Error</title>
657
400711951595 nginx-0.3.50-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
5 <style>
4840
b5ba6f22a0fc Improved 50x error page.
Valentin Bartenev <vbart@nginx.com>
parents: 663
diff changeset
6 body {
b5ba6f22a0fc Improved 50x error page.
Valentin Bartenev <vbart@nginx.com>
parents: 663
diff changeset
7 width: 35em;
b5ba6f22a0fc Improved 50x error page.
Valentin Bartenev <vbart@nginx.com>
parents: 663
diff changeset
8 margin: 0 auto;
b5ba6f22a0fc Improved 50x error page.
Valentin Bartenev <vbart@nginx.com>
parents: 663
diff changeset
9 font-family: Tahoma, Verdana, Arial, sans-serif;
b5ba6f22a0fc Improved 50x error page.
Valentin Bartenev <vbart@nginx.com>
parents: 663
diff changeset
10 }
657
400711951595 nginx-0.3.50-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
11 </style>
400711951595 nginx-0.3.50-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
12 </head>
4840
b5ba6f22a0fc Improved 50x error page.
Valentin Bartenev <vbart@nginx.com>
parents: 663
diff changeset
13 <body>
b5ba6f22a0fc Improved 50x error page.
Valentin Bartenev <vbart@nginx.com>
parents: 663
diff changeset
14 <h1>An error occurred.</h1>
b5ba6f22a0fc Improved 50x error page.
Valentin Bartenev <vbart@nginx.com>
parents: 663
diff changeset
15 <p>Sorry, the page you are looking for is currently unavailable.<br/>
b5ba6f22a0fc Improved 50x error page.
Valentin Bartenev <vbart@nginx.com>
parents: 663
diff changeset
16 Please try again later.</p>
b5ba6f22a0fc Improved 50x error page.
Valentin Bartenev <vbart@nginx.com>
parents: 663
diff changeset
17 <p>If you are the system administrator of this resource then you should check
b5ba6f22a0fc Improved 50x error page.
Valentin Bartenev <vbart@nginx.com>
parents: 663
diff changeset
18 the <a href="http://nginx.org/r/error_log">error log</a> for details.</p>
b5ba6f22a0fc Improved 50x error page.
Valentin Bartenev <vbart@nginx.com>
parents: 663
diff changeset
19 <p><em>Faithfully yours, nginx.</em></p>
657
400711951595 nginx-0.3.50-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
20 </body>
400711951595 nginx-0.3.50-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
21 </html>