You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by fe...@apache.org on 2005/02/24 01:08:20 UTC

svn commit: r155108 - spamassassin/trunk/rules/70_testing.cf

Author: felicity
Date: Wed Feb 23 16:08:18 2005
New Revision: 155108

URL: http://svn.apache.org/viewcvs?view=rev&rev=155108
Log:
convert some test rules to uri from body:eval/html

Modified:
    spamassassin/trunk/rules/70_testing.cf

Modified: spamassassin/trunk/rules/70_testing.cf
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/70_testing.cf?view=diff&r1=155107&r2=155108
==============================================================================
--- spamassassin/trunk/rules/70_testing.cf (original)
+++ spamassassin/trunk/rules/70_testing.cf Wed Feb 23 16:08:18 2005
@@ -278,22 +278,22 @@
 header T_RATWARE_HASH_2_C       X-Mailer =~ /^[A-Za-z0-9]{16,}$/
 header T_RATWARE_HASH_2_V2_C    X-Mailer =~ /^[A-Za-z0-9]{14,}$/
 
-body T_HTML_JS_0	eval:html_text_match('uri', '^(?is)javascript:')
-body T_HTML_JS_1	eval:html_text_match('uri', '^(?is)\s*javascript:')
-body T_HTML_JS_2	eval:html_text_match('uri', '^(?is)javascript:.*;')
-body T_HTML_JS_3	eval:html_text_match('uri', '^(?is)\s*javascript:.*;')
+uri T_HTML_JS_0			/^javascript:/i
+uri T_HTML_JS_1			/^\s*javascript:/i
+uri T_HTML_JS_2			/^javascript:.*;/is
+uri T_HTML_JS_3			/^\s*javascript:.*;/is
 
-body T_HTML_JS_LONG_040	eval:html_text_match('uri', '^(?is)javascript:.{40}')
-body T_HTML_JS_LONG_080	eval:html_text_match('uri', '^(?is)javascript:.{80}')
-body T_HTML_JS_LONG_120	eval:html_text_match('uri', '^(?is)javascript:.{120}')
-body T_HTML_JS_LONG_160	eval:html_text_match('uri', '^(?is)javascript:.{160}')
-body T_HTML_JS_LONG_200	eval:html_text_match('uri', '^(?is)javascript:.{200}')
+uri T_HTML_JS_LONG_040		/^javascript:.{40}/is
+uri T_HTML_JS_LONG_080		/^javascript:.{80}/is
+uri T_HTML_JS_LONG_120		/^javascript:.{120}/is
+uri T_HTML_JS_LONG_160		/^javascript:.{160}/is
+uri T_HTML_JS_LONG_200		/^javascript:.{200}/is
 
-body T_HTML_JS_EXPR_1	eval:html_text_match('uri', '^(?is)javascript:.*;')
-body T_HTML_JS_EXPR_2	eval:html_text_match('uri', '^(?is)javascript:.*;.*;')
-body T_HTML_JS_EXPR_3	eval:html_text_match('uri', '^(?is)javascript:.*;.*;.*;')
-body T_HTML_JS_EXPR_4	eval:html_text_match('uri', '^(?is)javascript:.*;.*;.*;.*;')
-body T_HTML_JS_EXPR_5	eval:html_text_match('uri', '^(?is)javascript:.*;.*;.*;.*;.*;')
+uri T_HTML_JS_EXPR_1		/^javascript:.*;/is
+uri T_HTML_JS_EXPR_2		/^javascript:.*;.*;/is
+uri T_HTML_JS_EXPR_3		/^javascript:.*;.*;.*;/is
+uri T_HTML_JS_EXPR_4		/^javascript:.*;.*;.*;.*;/is
+uri T_HTML_JS_EXPR_5		/^javascript:.*;.*;.*;.*;.*;/is
 
 body T_HTML_SCRIPT_0		eval:html_text_match('script', '.')
 body T_HTML_SCRIPT_1		eval:html_text_match('script', ';')