svn commit: r1173177 - in /spamassassin/trunk: lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm lib/Mail/SpamAssassin/Util.pm lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm sa-update.raw

[mm...@apache.org]

Author: mmartinec
Date: Tue Sep 20 14:58:57 2011
New Revision: 1173177

URL: http://svn.apache.org/viewvc?rev=1173177&view=rev
Log:
some minor tweaks: readability, user data as boolean, debug aids

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm
    spamassassin/trunk/sa-update.raw

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm?rev=1173177&r1=1173176&r2=1173177&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm Tue Sep 20 14:58:57 2011
@@ -444,7 +444,7 @@ sub parsed_metadata {
     # take the usable domains and add them to the ordered list
     while (my($host,$domain) = each( %{$info->{hosts}} )) {
       if ($skip_domains->{$domain}) {
-        dbg("uridnsbl: domain $domain in skip list");
+        dbg("uridnsbl: domain $domain in skip list, host $host");
       } else {
         # use hostname as a key, and drag along the stripped domain name part
         $uri_ordered[$entry]->{$host} = $domain;

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm?rev=1173177&r1=1173176&r2=1173177&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm Tue Sep 20 14:58:57 2011
@@ -1158,16 +1158,16 @@ sub uri_to_domain {
   # Javascript is not going to help us, so return.
   return if ($uri =~ /^javascript:/i);
 
-  $uri =~ s,#.*$,,gs;			# drop fragment
-  $uri =~ s#^[a-z]+:/{0,2}##gsi;	# drop the protocol
-  $uri =~ s,^[^/]*\@,,gs;		# username/passwd
+  $uri =~ s{\#.*$}{}gs;			# drop fragment
+  $uri =~ s{^[a-z]+:/{0,2}}{}gsi;	# drop the protocol
+  $uri =~ s{^[^/]*\@}{}gs;		# username/passwd
 
   # strip path and CGI params.  note: bug 4213 shows that "&" should
   # *not* be likewise stripped here -- it's permitted in hostnames by
   # some common MUAs!
-  $uri =~ s,[/\?].*$,,gs;              
+  $uri =~ s{[/?].*$}{}gs;              
 
-  $uri =~ s,:\d*$,,gs;			# port, bug 4191: sometimes the # is missing
+  $uri =~ s{:\d*$}{}gs;		# port, bug 4191: sometimes the # is missing
 
   # skip undecoded URIs if the encoded bits shouldn't be.
   # we'll see the decoded version as well.  see url_encode()

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm?rev=1173177&r1=1173176&r2=1173177&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm Tue Sep 20 14:58:57 2011
@@ -313,7 +313,7 @@ sub split_domain {
   my $domain = lc shift;
   my $hostname = '';
 
-  if ($domain) {
+  if (defined $domain && $domain ne '') {
     # www..spamassassin.org -> www.spamassassin.org
     $domain =~ tr/././s;
 

Modified: spamassassin/trunk/sa-update.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sa-update.raw?rev=1173177&r1=1173176&r2=1173177&view=diff
==============================================================================
--- spamassassin/trunk/sa-update.raw (original)
+++ spamassassin/trunk/sa-update.raw Tue Sep 20 14:58:57 2011
@@ -514,7 +514,7 @@ foreach my $channel (@channels) {
       next;
     }
 
-    print "Update available for channel $channel\n"  if $opt{'verbose'};
+    print "Update available for channel $channel: $currentV -> $newV\n"  if $opt{'verbose'};
 
     # If we are only checking for update availability, exit now
     if ( defined $opt{'checkonly'} ) {