You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by ms...@apache.org on 2007/08/10 01:27:16 UTC

svn commit: r564421 - /spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm

Author: mss
Date: Thu Aug  9 16:27:13 2007
New Revision: 564421

URL: http://svn.apache.org/viewvc?view=rev&rev=564421
Log:
Tiny fix to avoid angle brackets around URLs in DNSBL TXT replies when there are already brackets (looks especially weird 
at the closing bracket).

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

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm?view=diff&rev=564421&r1=564420&r2=564421
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm Thu Aug  9 16:27:13 2007
@@ -182,7 +182,7 @@
     if ($answer->type eq 'TXT') {
       $log = $answer->rdatastr;
       $log =~ s/^"(.*)"$/$1/;
-      $log =~ s/(http:\/\/\S+)/<$1>/g;
+      $log =~ s/(?<![<([])(https?:\/\/\S+)/<$1>/g;
     }
     elsif ($question->string =~ m/^(\d+)\.(\d+)\.(\d+)\.(\d+)\.(\S+\w)/) {
       $log = "$4.$3.$2.$1 listed in $5";