You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2020/01/18 07:35:12 UTC
svn commit: r1872939 -
/spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf
Author: hege
Date: Sat Jan 18 07:35:11 2020
New Revision: 1872939
URL: http://svn.apache.org/viewvc?rev=1872939&view=rev
Log:
Full rules need to use \r?$ instead of $
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=1872939&r1=1872938&r2=1872939&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf Sat Jan 18 07:35:11 2020
@@ -2586,7 +2586,7 @@ tflags USB_DRIVES pu
#header __SUBJ_YOUR_LOGO Subject =~ /\b(?:with|having) your logos?\b/i
#header __SUBJ_CUSTOM_WITH_LOGO Subject =~ /^(?=.*\bcustom\b).*(?:printed |with )+(?:your )?logos?\b/i
-full __FROM_NAME_IN_MSG /^From:\s+([^<]\S+\s\S+)\s(?=.{1,2048}^\1$)/sm
+full __FROM_NAME_IN_MSG /^From:\s+([^<]\S+\s\S+)\s(?=.{1,2048}^\1\r?$)/sm
meta FRNAME_IN_MSG_XPRIO_NO_SUB (__FROM_NAME_IN_MSG && __XPRIO && (__SUBJECT_EMPTY || __SUBJ_SHORT)) && !__DKIM_EXISTS && !__SUBJ_NOT_SHORT && !ALL_TRUSTED
describe FRNAME_IN_MSG_XPRIO_NO_SUB From name in message + X-Priority + short or no subject
score FRNAME_IN_MSG_XPRIO_NO_SUB 2.500 # limit