diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-08-30 14:55:07 +0400 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2005-08-30 14:55:07 +0400 |
| commit | e5035397b01ec12f351a6a984f83091b821978cc (patch) | |
| tree | 9e65f1b24c595346b666559264878cbb911bfcf7 /contrib | |
| parent | e3c2cf87e537aba572b08afccabcb64976d43079 (diff) | |
nginx-0.1.43-RELEASE importrelease-0.1.43
*) Feature: the listen(2) backlog in the "listen" directive can be
changed using the -HUP signal.
*) Feature: the geo2nginx.pl script was added to contrib.
*) Change: the FastCGI parameters with the empty values now are passed
to a server.
*) Bugfix: the segmentation fault occurred or the worker process may
got caught in an endless loop if the proxied or FastCGI server sent
the "Cache-Control" header line and the "expires" directive was
used; in the proxied mode the the bug had appeared in 0.1.29.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/README | 6 | ||||
| -rw-r--r-- | contrib/geo2nginx.pl | 58 |
2 files changed, 64 insertions, 0 deletions
diff --git a/contrib/README b/contrib/README new file mode 100644 index 000000000..3a6909570 --- /dev/null +++ b/contrib/README @@ -0,0 +1,6 @@ + +geo2nginx.pl by Andrei Nigmatulin + + The perl script to convert CSV geoip database (free download + at http://www.maxmind.com/app/geoip_country) to format, suitable + for use with ngx_http_geo_module. diff --git a/contrib/geo2nginx.pl b/contrib/geo2nginx.pl new file mode 100644 index 000000000..29243ecf2 --- /dev/null +++ b/contrib/geo2nginx.pl @@ -0,0 +1,58 @@ +#!/usr/bin/perl -w
+
+# (c) Andrei Nigmatulin, 2005
+#
+# this script provided "as is", without any warranties. use it at your own risk.
+#
+# special thanx to Andrew Sitnikov for perl port
+#
+# this script converts CSV geoip database (free download at http://www.maxmind.com/app/geoip_country)
+# to format, suitable for use with nginx_http_geo module (http://sysoev.ru/nginx)
+#
+# for example, line with ip range
+#
+# "62.16.68.0","62.16.127.255","1041253376","1041268735","RU","Russian Federation"
+#
+# will be converted to four subnetworks:
+#
+# 62.16.68.0/22 RU;
+# 62.16.72.0/21 RU;
+# 62.16.80.0/20 RU;
+# 62.16.96.0/19 RU;
+
+
+use warnings;
+use strict;
+
+while( <STDIN> ){
+ if (/"[^"]+","[^"]+","([^"]+)","([^"]+)","([^"]+)"/){
+ print_subnets($1, $2, $3);
+ }
+}
+
+sub print_subnets {
+ my ($a1, $a2, $c) = @_;
+ my $l;
+ while ($a1 <= $a2) {
+ for ($l = 0; ($a1 & (1 << $l)) == 0 && ($a1 + ((1 << ($l + 1)) - 1)) <= $a2; $l++){};
+ print long2ip($a1) . "/" . (32 - $l) . " " . $c . ";\n";
+ $a1 += (1 << $l);
+ }
+}
+
+sub long2ip {
+ my $ip = shift;
+
+ my $str = 0;
+
+ $str = ($ip & 255);
+
+ $ip >>= 8;
+ $str = ($ip & 255).".$str";
+
+ $ip >>= 8;
+ $str = ($ip & 255).".$str";
+
+ $ip >>= 8;
+ $str = ($ip & 255).".$str";
+}
|