svn commit: r1099867 - /spamassassin/branches/3.3/lib/Mail/SpamAssassin/Message/Metadata/Received.pm

[mm...@apache.org]

Author: mmartinec
Date: Thu May  5 16:37:11 2011
New Revision: 1099867

URL: http://svn.apache.org/viewvc?rev=1099867&view=rev
Log:
Bug 6500: clear_originating_ip_headers seems to be broken

Modified:
    spamassassin/branches/3.3/lib/Mail/SpamAssassin/Message/Metadata/Received.pm

Modified: spamassassin/branches/3.3/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.3/lib/Mail/SpamAssassin/Message/Metadata/Received.pm?rev=1099867&r1=1099866&r2=1099867&view=diff
==============================================================================
--- spamassassin/branches/3.3/lib/Mail/SpamAssassin/Message/Metadata/Received.pm (original)
+++ spamassassin/branches/3.3/lib/Mail/SpamAssassin/Message/Metadata/Received.pm Thu May  5 16:37:11 2011
@@ -116,8 +116,7 @@ sub parse_received_headers {
   # Now add the single line headers like X-Originating-IP. (bug 5680)
   # we convert them into synthetic "Received" headers so we can share
   # code below.
-  for my $header ('X-Yahoo-Post-IP', 'X-Originating-IP',
-                    'X-Apparently-From', 'X-SenderIP')
+  for my $header (@{$permsgstatus->{main}->{conf}->{originating_ip_headers}})
   {
     my $str = $msg->get_header($header);
     next unless ($str && $str =~ m/($IP_ADDRESS)/);