Mailing List Archive

Author: felicity
Date: Tue May 10 13:46:26 2005
New Revision: 169520

URL: http://svn.apache.org/viewcvs?rev=169520&view=rev
Log:
no point in calling extract_message_metadata from the URIBL plugin since the calling function is called from extract_... also, setup for HTML URI canonification when metadata->html hasn't been set yet.

Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=169520&r1=169519&r2=169520&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm Tue May 10 13:46:26 2005
@@ -1312,9 +1312,11 @@
$self->{tag_data}->{RELAYSUNTRUSTED} = $self->{relays_untrusted_str};
$self->{tag_data}->{LANGUAGES} = $self->{msg}->get_metadata("X-Languages");

- # NOTE: this has to come after get_decoded_stripped_body_text_array() as it's
- # the one that sets {metadata}->{html} ... it should be called before
- # extract_message_metadata() ...
+ # NOTE: we may have to call get_decoded_stripped_body_text_array so
+ # that {metadata}->{html} gets set...
+ if (!$self->{msg}->{metadata}->{html}) {
+ $self->get_decoded_stripped_body_text_array();
+ }
$self->{html} = $self->{msg}->{metadata}->{html};

# canonify the HTML parsed URIs

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm?rev=169520&r1=169519&r2=169520&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm Tue May 10 13:46:26 2005
@@ -193,9 +193,6 @@
# use the parsed uris from the rendered message text
my @parsed = $scanner->get_parsed_uri_list();

- # We need the Metadata extracted to get the canonified HTML parsed URIs
- $scanner->extract_message_metadata();
-
# Generate the full list of html-parsed domains.
my $html = $scanner->{html}->{uri_detail} || { };