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 2007/07/02 11:31:45 UTC
svn commit: r552442 - in /spamassassin/branches/3.2:
lib/Mail/SpamAssassin/Plugin/Check.pm t/spamd_allow_user_rules.t
Author: jm
Date: Mon Jul 2 02:31:44 2007
New Revision: 552442
URL: http://svn.apache.org/viewvc?view=rev&rev=552442
Log:
bug 5445: body eval tests defined in user_rules cause 'Subroutine _eval_tests_type11_prineg400_set3 redefined' warnings; fix
Modified:
spamassassin/branches/3.2/lib/Mail/SpamAssassin/Plugin/Check.pm
spamassassin/branches/3.2/t/spamd_allow_user_rules.t
Modified: spamassassin/branches/3.2/lib/Mail/SpamAssassin/Plugin/Check.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.2/lib/Mail/SpamAssassin/Plugin/Check.pm?view=diff&rev=552442&r1=552441&r2=552442
==============================================================================
--- spamassassin/branches/3.2/lib/Mail/SpamAssassin/Plugin/Check.pm (original)
+++ spamassassin/branches/3.2/lib/Mail/SpamAssassin/Plugin/Check.pm Mon Jul 2 02:31:44 2007
@@ -971,6 +971,7 @@
}
EOT
+ undef &{$methodname};
eval $evalstr;
if ($@) {
Modified: spamassassin/branches/3.2/t/spamd_allow_user_rules.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.2/t/spamd_allow_user_rules.t?view=diff&rev=552442&r1=552441&r2=552442
==============================================================================
--- spamassassin/branches/3.2/t/spamd_allow_user_rules.t (original)
+++ spamassassin/branches/3.2/t/spamd_allow_user_rules.t Mon Jul 2 02:31:44 2007
@@ -26,14 +26,36 @@
tstlocalrules ("
allow_user_rules 1
+ loadplugin myTestPlugin ../../data/testplugin.pm
");
rmtree ("log/virtualconfig/testuser", 0, 1);
mkpath ("log/virtualconfig/testuser", 0, 0755);
open (OUT, ">log/virtualconfig/testuser/user_prefs");
-print OUT "
+print OUT q{
+
header MYFOO Content-Transfer-Encoding =~ /quoted-printable/
-";
+ header MYHEADEVAL eval:check_return_2()
+
+ # bug 5445
+ urirhsbl URIBL_DYNAMIC_MPRHS dynamic.rhs.mailpolice.com. A
+ body URIBL_DYNAMIC_MPRHS eval:check_uridnsbl('URIBL_DYNAMIC_MPRHS')
+ describe URIBL_DYNAMIC_MPRHS Contains a URL listed in the MailPolice dynamic domains list
+ tflags URIBL_DYNAMIC_MPRHS net
+ priority URIBL_DYNAMIC_MPRHS -100
+ score URIBL_DYNAMIC_MPRHS 0.5
+
+ body MYBAR /bar/
+ body MYBODYEVAL eval:check_return_2()
+ rawbody MYRAWBAR /bar/
+ rawbody MYRAWBODYEVAL eval:check_return_2()
+ uri MYURI /uri/
+ full MYFULLBAR /bar/
+ full MYFULLEVAL eval:check_return_2()
+
+ meta MYMETA (MYBAR && MYFULLBAR && MYHEADEVAL)
+
+};
close OUT;
ok (start_spamd ("--virtual-config-dir=log/virtualconfig/%u -L -u $spamd_run_as_user"));