You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by do...@apache.org on 2005/05/12 02:08:53 UTC
svn commit: r169736 - in /spamassassin/trunk:
lib/Mail/SpamAssassin/Plugin/MIMEHeader.pm t/mimeheader.t
Author: dos
Date: Wed May 11 17:08:51 2005
New Revision: 169736
URL: http://svn.apache.org/viewcvs?rev=169736&view=rev
Log:
fix MIMEHeader regexp validation & test
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/MIMEHeader.pm
spamassassin/trunk/t/mimeheader.t
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/MIMEHeader.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/MIMEHeader.pm?rev=169736&r1=169735&r2=169736&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/MIMEHeader.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/MIMEHeader.pm Wed May 11 17:08:51 2005
@@ -102,12 +102,12 @@
my $negated = ($3 eq '!~') ? 1 : 0;
my $pattern = $4;
- $pattern = $pluginobj->make_qr($pattern);
-
if (!$pattern || !$self->{parser}->is_regexp_valid($rulename, $pattern))
{
return $Mail::SpamAssassin::Conf::INVALID_VALUE;
}
+
+ $pattern = $pluginobj->make_qr($pattern);
$self->{mimeheader_tests}->{$rulename} = {
hdr => $hdrname,
Modified: spamassassin/trunk/t/mimeheader.t
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/t/mimeheader.t?rev=169736&r1=169735&r2=169736&view=diff
==============================================================================
--- spamassassin/trunk/t/mimeheader.t (original)
+++ spamassassin/trunk/t/mimeheader.t Wed May 11 17:08:51 2005
@@ -15,13 +15,13 @@
);
-tstprefs ("
+tstprefs (q{
# loadplugin Mail::SpamAssassin::Plugin::MIMEHeader
mimeheader MIMEHEADER_TEST1 content-type =~ /application\/msword/
mimeheader MIMEHEADER_TEST2 content-type =~ m!APPLICATION/MSWORD!i
- ");
+ });
sarun ("-L -t < data/nice/004", \&patterns_run_cb);
ok_all_patterns();