You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2008/07/11 10:54:57 UTC

svn commit: r675869 - /spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm

Author: jm
Date: Fri Jul 11 01:54:56 2008
New Revision: 675869

URL: http://svn.apache.org/viewvc?rev=675869&view=rev
Log:
bug 5931: remove needless O(N^2) de-duplication step from trusted_networks

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm?rev=675869&r1=675868&r2=675869&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm Fri Jul 11 01:54:56 2008
@@ -80,7 +80,9 @@
       $ip6 = $ip;
     }
 
-    next if ($self->is_net_declared($ip4, $ip6, $exclude, 0));
+    # bug 5931: this is O(n^2).  bad if there are lots of nets, and
+    # it's harmless to have duplicates anyway
+    # next if ($self->is_net_declared($ip4, $ip6, $exclude, 0));
 
     # note: it appears a NetAddr::IP object takes up about 279 bytes
     push @{$self->{nets}}, {