You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by fe...@apache.org on 2004/04/16 06:20:36 UTC

svn commit: rev 10039 - incubator/spamassassin/trunk/lib/Mail/SpamAssassin

Author: felicity
Date: Thu Apr 15 21:20:35 2004
New Revision: 10039

Modified:
   incubator/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
Log:
bug 3275: ':addr' was a little broken as it was trying to remove multiple addresses without checking for quotes and such first.

Modified: incubator/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
==============================================================================
--- incubator/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm	(original)
+++ incubator/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm	Thu Apr 15 21:20:35 2004
@@ -1106,7 +1106,6 @@
         s/\s+/ /g;			# reduce whitespace to single space
         s/^\s+//;			# leading wsp
         s/\s+$//;			# trailing wsp
-        s/,.*$//;			# multiple addrs on one line? remove all but first
 
         if ($getaddr) {
        	  # Get the email address out of the header
@@ -1122,6 +1121,7 @@
 	  #
           s/\s*\(.*?\)//g;		# strip out the (comments)
           s/^[^<]*?<(.*?)>.*$/$1/;	# "Foo Blah" <jm...@foo> or <jm...@foo>
+          s/,.*$//;			# multiple addrs on one line? remove all but first
         }
         elsif ($getname) {
 	  # Get the real name out of the header