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 2004/10/04 08:19:03 UTC

svn commit: rev 51865 - spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata

Author: jm
Date: Sun Oct  3 23:19:02 2004
New Revision: 51865

Modified:
   spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
Log:
bug 3830: add support for 'return-path' to extract MAIL FROM address from Received: headers

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm	(original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm	Sun Oct  3 23:19:02 2004
@@ -390,7 +390,7 @@
 
   if (/^from /) {
     # try to catch enveloper senders
-    if (/envelope-(?:sender|from)[ =](\S+)\b/) {
+    if (/(?:return-path:? |envelope-(?:sender|from)[ =])(\S+)\b/i) {
       $envfrom = $1;
     }