Mercurial > hg > nginx-vendor-current
annotate contrib/geo2nginx.pl @ 650:4d05413aebad NGINX_1_1_9
nginx 1.1.9
*) Change: now double quotes are encoded in an "echo" SSI-command
output.
Thanks to Zaur Abasmirzoev.
*) Feature: the "valid" parameter of the "resolver" directive. By
default TTL returned by a DNS server is used.
Thanks to Kirill A. Korinskiy.
*) Bugfix: nginx might hang after a worker process abnormal termination.
*) Bugfix: a segmentation fault might occur in a worker process if SNI
was used; the bug had appeared in 1.1.2.
*) Bugfix: in the "keepalive_disable" directive; the bug had appeared in
1.1.8.
Thanks to Alexander Usov.
*) Bugfix: SIGWINCH signal did not work after first binary upgrade; the
bug had appeared in 1.1.1.
*) Bugfix: backend responses with length not matching "Content-Length"
header line are no longer cached.
*) Bugfix: in the "scgi_param" directive, if complex parameters were
used.
*) Bugfix: in the "epoll" event method.
Thanks to Yichun Zhang.
*) Bugfix: in the ngx_http_flv_module.
Thanks to Piotr Sikora.
*) Bugfix: in the ngx_http_mp4_module.
*) Bugfix: IPv6 addresses are now handled properly in a request line and
in a "Host" request header line.
*) Bugfix: "add_header" and "expires" directives did not work if a
request was proxied and response status code was 206.
*) Bugfix: nginx could not be built on FreeBSD 10.
*) Bugfix: nginx could not be built on AIX.
| author | Igor Sysoev <http://sysoev.ru> |
|---|---|
| date | Mon, 28 Nov 2011 00:00:00 +0400 |
| parents | 962c43960644 |
| children |
| rev | line source |
|---|---|
| 86 | 1 #!/usr/bin/perl -w |
| 2 | |
| 3 # (c) Andrei Nigmatulin, 2005 | |
| 4 # | |
| 5 # this script provided "as is", without any warranties. use it at your own risk. | |
| 6 # | |
| 7 # special thanx to Andrew Sitnikov for perl port | |
| 8 # | |
| 9 # this script converts CSV geoip database (free download at http://www.maxmind.com/app/geoip_country) | |
| 10 # to format, suitable for use with nginx_http_geo module (http://sysoev.ru/nginx) | |
| 11 # | |
| 12 # for example, line with ip range | |
| 13 # | |
| 14 # "62.16.68.0","62.16.127.255","1041253376","1041268735","RU","Russian Federation" | |
| 15 # | |
| 16 # will be converted to four subnetworks: | |
| 17 # | |
| 18 # 62.16.68.0/22 RU; | |
| 19 # 62.16.72.0/21 RU; | |
| 20 # 62.16.80.0/20 RU; | |
| 21 # 62.16.96.0/19 RU; | |
| 22 | |
| 23 | |
| 24 use warnings; | |
| 25 use strict; | |
| 26 | |
| 27 while( <STDIN> ){ | |
| 28 if (/"[^"]+","[^"]+","([^"]+)","([^"]+)","([^"]+)"/){ | |
| 29 print_subnets($1, $2, $3); | |
| 30 } | |
| 31 } | |
| 32 | |
| 33 sub print_subnets { | |
| 34 my ($a1, $a2, $c) = @_; | |
| 35 my $l; | |
| 36 while ($a1 <= $a2) { | |
| 37 for ($l = 0; ($a1 & (1 << $l)) == 0 && ($a1 + ((1 << ($l + 1)) - 1)) <= $a2; $l++){}; | |
| 38 print long2ip($a1) . "/" . (32 - $l) . " " . $c . ";\n"; | |
| 39 $a1 += (1 << $l); | |
| 40 } | |
| 41 } | |
| 42 | |
| 43 sub long2ip { | |
| 44 my $ip = shift; | |
| 45 | |
| 46 my $str = 0; | |
| 47 | |
| 48 $str = ($ip & 255); | |
| 49 | |
| 50 $ip >>= 8; | |
| 51 $str = ($ip & 255).".$str"; | |
| 52 | |
| 53 $ip >>= 8; | |
| 54 $str = ($ip & 255).".$str"; | |
| 55 | |
| 56 $ip >>= 8; | |
| 57 $str = ($ip & 255).".$str"; | |
| 58 } |