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 2014/11/27 19:58:07 UTC

svn commit: r1642208 - /spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf

Author: jhardin
Date: Thu Nov 27 18:58:07 2014
New Revision: 1642208

URL: http://svn.apache.org/r1642208
Log:
Restore PDS_FROM_2_EMAILS protected by "if perl_version >= 5.010000"

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=1642208&r1=1642207&r2=1642208&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf Thu Nov 27 18:58:07 2014
@@ -490,8 +490,10 @@ meta           PDS_TO_EQ_FROM_NAME      
 describe       PDS_TO_EQ_FROM_NAME           From: name same as To: address
 
 # ++ not liked by perl 5.8.x
-# header  __PDS_FROM_2_EMAILS     From =~ /^\W+([\w+.-]+\@[\w.-]+\.\w\w++)(?:[^\n\w<]{0,80})?<(?!\1)[^\n\s]*\@/i
-#  meta    PDS_FROM_2_EMAILS       __PDS_FROM_2_EMAILS && !__VIA_ML && !__VIA_RESIGNER
+if perl_version >= 5.010000
+  header  __PDS_FROM_2_EMAILS     From =~ /^\W+([\w+.-]+\@[\w.-]+\.\w\w++)(?:[^\n\w<]{0,80})?<(?!\1)[^\n\s]*\@/i
+  meta    PDS_FROM_2_EMAILS       __PDS_FROM_2_EMAILS && !__VIA_ML && !__VIA_RESIGNER
+endif
 
 uri     __PDS_LOC_WP_POMO       m;/wp-includes/pomo/(?!(?:entry|po|mo|streams|translations)\.php).*;i