Mailing List Archive

Author: gbechis
Date: Tue May 5 10:20:21 2020
New Revision: 1877386

URL: http://svn.apache.org/viewvc?rev=1877386&view=rev
Log:
always define $country

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=1877386&r1=1877385&r2=1877386&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/GeoDB.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/GeoDB.pm Tue May 5 10:20:21 2020
@@ -528,7 +528,7 @@ sub load_geoip {
dbg("geodb: GeoIP country query failed for $_[1]");
return $res;
};
- $res->{country} = $country;
+ $res->{country} = $country || 'XX';
$res->{continent} = $country_to_continent{$country} || 'XX';
return $res;
};
@@ -623,7 +623,7 @@ sub load_dbfile {
dbg("geodb: IP::Country::DB_File country query failed for $_[1]");
return $res;
};
- $res->{country} = $country;
+ $res->{country} = $country | 'XX';
$res->{continent} = $country_to_continent{$country} || 'XX';
return $res;
};
@@ -660,7 +660,7 @@ sub load_fast {
} else {
return $res
}
- $res->{country} = $country;
+ $res->{country} = $country || 'XX';
$res->{continent} = $country_to_continent{$country} || 'XX';
return $res;
};