You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by pa...@apache.org on 2005/04/26 20:05:40 UTC
svn commit: r164848 - in /spamassassin/branches/3.0:
lib/Mail/SpamAssassin/Message/Metadata/Received.pm t/rcvd_parser.t
Author: parker
Date: Tue Apr 26 11:05:39 2005
New Revision: 164848
URL: http://svn.apache.org/viewcvs?rev=164848&view=rev
Log:
Bug 4053: XMail v1.21 received header change
Modified:
spamassassin/branches/3.0/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
spamassassin/branches/3.0/t/rcvd_parser.t
Modified: spamassassin/branches/3.0/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
URL: http://svn.apache.org/viewcvs/spamassassin/branches/3.0/lib/Mail/SpamAssassin/Message/Metadata/Received.pm?rev=164848&r1=164847&r2=164848&view=diff
==============================================================================
--- spamassassin/branches/3.0/lib/Mail/SpamAssassin/Message/Metadata/Received.pm (original)
+++ spamassassin/branches/3.0/lib/Mail/SpamAssassin/Message/Metadata/Received.pm Tue Apr 26 11:05:39 2005
@@ -416,7 +416,7 @@
if (/\[XMail /) { # bug 3791
# Received: from list.brainbuzz.com (63.146.189.86:23198) by mx1.yourtech.net with [XMail 1.20 ESMTP Server] id <S72E> for <ja...@ellingson.org> from <bo...@list.cramsession.com>; Sat, 18 Sep 2004 23:17:54 -0500
# Received: from list.brainbuzz.com (63.146.189.86:23198) by mx1.yourtech.net (209.32.147.34:25) with [XMail 1.20 ESMTP Server] id <S72E> for <ja...@ellingson.org> from <bo...@list.cramsession.com>; Sat, 18 Sep 2004 23:17:54 -0500
- if (/^from (\S+) \((${IP_ADDRESS})(?::\d+)?\) by (\S+)(?: \(\S+\)|) with \[XMail/)
+ if (/^from (\S+) \((\[?${IP_ADDRESS}\]?)(?::\d+)?\) by (\S+)(?: \(\S+\)|) with \[XMail/)
{
$helo = $1; $ip = $2; $by = $3;
/ id <(\S+)> / and $id = $1;
Modified: spamassassin/branches/3.0/t/rcvd_parser.t
URL: http://svn.apache.org/viewcvs/spamassassin/branches/3.0/t/rcvd_parser.t?rev=164848&r1=164847&r2=164848&view=diff
==============================================================================
--- spamassassin/branches/3.0/t/rcvd_parser.t (original)
+++ spamassassin/branches/3.0/t/rcvd_parser.t Tue Apr 26 11:05:39 2005
@@ -18,7 +18,7 @@
use lib '.'; use lib 't';
use SATest; sa_t_init("rcvd_parser");
-use Test; BEGIN { plan tests => 41 };
+use Test; BEGIN { plan tests => 42 };
use strict;
@@ -465,7 +465,7 @@
},
q{
-Received: from list.brainbuzz.com (63.146.189.86:23198)
+Received: from list.brainbuzz.com ([63.146.189.86]:23198)
by mx1.yourtech.net with [XMail 1.20 ESMTP Server]
id <S72E> for <jj...@obfuscatedellingson.org> from <bo...@list.obfuscatedzzzzzzz.com>; Sat, 18 Sep 2004 23:17:54 -0500