You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by do...@apache.org on 2005/05/09 22:57:59 UTC
svn commit: r169357 - in /spamassassin/trunk: lib/Mail/SpamAssassin/Conf.pm
rules/20_uri_tests.cf
Author: dos
Date: Mon May 9 13:57:58 2005
New Revision: 169357
URL: http://svn.apache.org/viewcvs?rev=169357&view=rev
Log:
cleanup & add redirector_pattern s
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
spamassassin/trunk/rules/20_uri_tests.cf
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?rev=169357&r1=169356&r2=169357&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Mon May 9 13:57:58 2005
@@ -1589,7 +1589,7 @@
Example: http://chkpt.zdnet.com/chkpt/whatever/spammer.domain/yo/dude
- redirector_pattern /^(?:http://)?chkpt\.zdnet\.com/chkpt/\w+/(.*)$/
+ redirector_pattern /^https?://(?:opt\.)?chkpt\.zdnet\.com/chkpt/\w+/(.*)$/
=cut
Modified: spamassassin/trunk/rules/20_uri_tests.cf
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/20_uri_tests.cf?rev=169357&r1=169356&r2=169357&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_uri_tests.cf (original)
+++ spamassassin/trunk/rules/20_uri_tests.cf Mon May 9 13:57:58 2005
@@ -25,8 +25,9 @@
require_version @@VERSION@@
# Redirector URI patterns
-redirector_pattern /^(?:http://)?chkpt\.zdnet\.com/chkpt/\w+/(.*)$/
-redirector_pattern /^(?:http://)?www\.nate\.com/r/\w+/(.*)$/
+redirector_pattern /^http://chkpt\.zdnet\.com/chkpt/\w+/(.*)$/
+redirector_pattern /^http://www(?:\d+)?\.nate\.com/r/\w+/(.*)$/
+redirector_pattern /^http://.+\.gov/.*/?externalLink\.jhtml\?.*url=(.*?)(?:&.*)?$/
uri NUMERIC_HTTP_ADDR /^https?\:\/\/\d{7}/is
describe NUMERIC_HTTP_ADDR Uses a numeric IP address in URL