annotate docs/html/index.html @ 5047:852f40088278 stable-1.2

Merge of r4968, r4969, r4977, r4980, r4981, r4990: geo fixes. *) Geo: improved ngx_http_geo_block() code readability. *) Geo: fixed the "ranges" without ranges case. The following configuration returned an empty value for $geo: geo $geo { ranges; default default; } *) Fixed return type of internal function that allocates radix tree nodes. *) There's no need to normalize address returned by ngx_ptocidr(). *) Geo: ensure that default entry is always present. If 0.0.0.0/32 entry was present and there was no explicit "default", we failed to add an empty string as a default value. *) Trailing whitespace fix.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 11 Feb 2013 12:26:33 +0000
parents b91740dedb8a
children 67c68cd973b8
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4859
b91740dedb8a Merge of r4835, r4841: improved welcome and 50x error pages.
Maxim Dounin <mdounin@mdounin.ru>
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>
4859
b91740dedb8a Merge of r4835, r4841: improved welcome and 50x error pages.
Maxim Dounin <mdounin@mdounin.ru>
parents: 450
diff changeset
5 <style>
b91740dedb8a Merge of r4835, r4841: improved welcome and 50x error pages.
Maxim Dounin <mdounin@mdounin.ru>
parents: 450
diff changeset
6 body {
b91740dedb8a Merge of r4835, r4841: improved welcome and 50x error pages.
Maxim Dounin <mdounin@mdounin.ru>
parents: 450
diff changeset
7 width: 35em;
b91740dedb8a Merge of r4835, r4841: improved welcome and 50x error pages.
Maxim Dounin <mdounin@mdounin.ru>
parents: 450
diff changeset
8 margin: 0 auto;
b91740dedb8a Merge of r4835, r4841: improved welcome and 50x error pages.
Maxim Dounin <mdounin@mdounin.ru>
parents: 450
diff changeset
9 font-family: Tahoma, Verdana, Arial, sans-serif;
b91740dedb8a Merge of r4835, r4841: improved welcome and 50x error pages.
Maxim Dounin <mdounin@mdounin.ru>
parents: 450
diff changeset
10 }
b91740dedb8a Merge of r4835, r4841: improved welcome and 50x error pages.
Maxim Dounin <mdounin@mdounin.ru>
parents: 450
diff changeset
11 </style>
450
551102312e19 nginx-0.1.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
12 </head>
4859
b91740dedb8a Merge of r4835, r4841: improved welcome and 50x error pages.
Maxim Dounin <mdounin@mdounin.ru>
parents: 450
diff changeset
13 <body>
b91740dedb8a Merge of r4835, r4841: improved welcome and 50x error pages.
Maxim Dounin <mdounin@mdounin.ru>
parents: 450
diff changeset
14 <h1>Welcome to nginx!</h1>
b91740dedb8a Merge of r4835, r4841: improved welcome and 50x error pages.
Maxim Dounin <mdounin@mdounin.ru>
parents: 450
diff changeset
15 <p>If you see this page, the nginx web server is successfully installed and
b91740dedb8a Merge of r4835, r4841: improved welcome and 50x error pages.
Maxim Dounin <mdounin@mdounin.ru>
parents: 450
diff changeset
16 working. Further configuration is required.</p>
b91740dedb8a Merge of r4835, r4841: improved welcome and 50x error pages.
Maxim Dounin <mdounin@mdounin.ru>
parents: 450
diff changeset
17
b91740dedb8a Merge of r4835, r4841: improved welcome and 50x error pages.
Maxim Dounin <mdounin@mdounin.ru>
parents: 450
diff changeset
18 <p>For online documentation and support please refer to
b91740dedb8a Merge of r4835, r4841: improved welcome and 50x error pages.
Maxim Dounin <mdounin@mdounin.ru>
parents: 450
diff changeset
19 <a href="http://nginx.org/">nginx.org</a>.<br/>
b91740dedb8a Merge of r4835, r4841: improved welcome and 50x error pages.
Maxim Dounin <mdounin@mdounin.ru>
parents: 450
diff changeset
20 Commercial support is available at
b91740dedb8a Merge of r4835, r4841: improved welcome and 50x error pages.
Maxim Dounin <mdounin@mdounin.ru>
parents: 450
diff changeset
21 <a href="http://nginx.com/">nginx.com</a>.</p>
b91740dedb8a Merge of r4835, r4841: improved welcome and 50x error pages.
Maxim Dounin <mdounin@mdounin.ru>
parents: 450
diff changeset
22
b91740dedb8a Merge of r4835, r4841: improved welcome and 50x error pages.
Maxim Dounin <mdounin@mdounin.ru>
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>