You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2020/04/12 17:06:22 UTC
svn commit: r1876429 - /spamassassin/trunk/lib/Mail/SpamAssassin/GeoDB.pm
Author: hege
Date: Sun Apr 12 17:06:22 2020
New Revision: 1876429
URL: http://svn.apache.org/viewvc?rev=1876429&view=rev
Log:
Fix Geo::IP IPv6 country query from city db
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/GeoDB.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/GeoDB.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/GeoDB.pm?rev=1876429&r1=1876428&r2=1876429&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/GeoDB.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/GeoDB.pm Sun Apr 12 17:06:22 2020
@@ -498,10 +498,7 @@ sub load_geoip {
if ($_[1] =~ IS_IPV4_ADDRESS) {
$city = $_[0]->{db}->{city}->record_by_addr($_[1]);
} elsif ($_[0]->{db}->{city_v6}) {
- $city = $_[0]->{db}->{city_v6}->country_code_by_addr_v6($_[1]);
- return $res if !defined $city;
- $res->{country} = $city;
- return $res;
+ $city = $_[0]->{db}->{city_v6}->record_by_addr_v6($_[1]);
}
if (!defined $city) {
dbg("geodb: GeoIP city query failed for $_[1]");