You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jh...@apache.org on 2023/10/15 20:49:26 UTC
svn commit: r1912985 - /spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf
Author: jhardin
Date: Sun Oct 15 20:49:25 2023
New Revision: 1912985
URL: http://svn.apache.org/viewvc?rev=1912985&view=rev
Log:
Restore 4.x __SUBJ_HAS_FROM_1
Modified:
spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf
Modified: spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf?rev=1912985&r1=1912984&r2=1912985&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf Sun Oct 15 20:49:25 2023
@@ -500,12 +500,12 @@ describe __TO_EQ_FROM To:
# Suggested by Hans-Werner Friedemann on users list 09/30/2010
# improvement for 4.x+ from GBechis
-#if (version >= 4.000000) && can(Mail::SpamAssassin::Conf::feature_capture_rules)
-# header __GB_FROM_ADDR From:addr =~ /(?<GB_FROM_ADDR>.*)/
-# header __SUBJ_HAS_FROM_1 Subject =~ /%{GB_FROM_ADDR}/i
-#else
+if (version >= 4.000000) && can(Mail::SpamAssassin::Conf::feature_capture_rules)
+ header __GB_FROM_ADDR From:addr =~ /(?<GB_FROM_ADDR>.*)/
+ header __SUBJ_HAS_FROM_1 Subject =~ /%{GB_FROM_ADDR}/i
+else
header __SUBJ_HAS_FROM_1 ALL =~ /\nFrom: (?:[^\n<]{0,80}<)?([^\n\s>]+)>?\n+(?:[^\n]{1,100}\n+)*Subject: [^\n]{0,100}\1[>,:\s\n]/ism
-#endif
+endif
meta FROM_IN_TO_AND_SUBJ (__TO_EQ_FROM && __SUBJ_HAS_FROM_1) && !__HAS_LIST_ID
describe FROM_IN_TO_AND_SUBJ From address is in To and Subject
tflags FROM_IN_TO_AND_SUBJ publish