fix badword, ipv6 address detect, add CTY

[spider.git] / perl / DXUtil.pm

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index cd50f4ae3f8ee6a04f370dde347412393fc3d313..b42d808d0e0aaa149b444e212e108e43420bb5d0 100644 (file)
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -448,7 +448,7 @@ sub is_latlong
 # is it an ip address?
 sub is_ipaddr
 {
-    return $_[0] =~ /^\d+\.\d+\.\d+\.\d+$/ || $_[0] =~  /^(?:[\da-f]{1,4}:|:)(?:\:[0-9a-f]{1,4}){1,6}/i;
+    return $_[0] =~ /^(?:(?:\:\:)?\d+\.\d+\.\d+\.\d+)|(?:[0-9a-f]{1,4}\:)?(?:\:[0-9a-f]{1,4}){1,6}$/i;
 }
 
 # is it a zulu time hhmmZ