X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=default.filter;h=b5ca574463ac4cf2ad1735afe2dc26b2d42f89d3;hb=f4d4d38402b997bd687ab86577b533c523baecc6;hp=7f37eb0ab33ddf2f5f6b6d073a25fe7e3164c6d4;hpb=f3ea9cdda9262225ba746cc6a4ab8483d8e8fe9a;p=privoxy.git
diff --git a/default.filter b/default.filter
index 7f37eb0a..b5ca5744 100644
--- a/default.filter
+++ b/default.filter
@@ -2,11 +2,11 @@
#
# File : $Source: /cvsroot/ijbswa/current/default.filter,v $
#
-# $Id: default.filter,v 1.53 2007/12/23 15:48:12 fabiankeil Exp $
+# $Id: default.filter,v 1.77 2010/02/05 21:41:31 fabiankeil Exp $
#
# Purpose : Rules to process the content of web pages
#
-# Copyright : Written by and Copyright (C) 2001 - 2007 the
+# Copyright : Written by and Copyright (C) 2001-2010 the
# Privoxy team. http://www.privoxy.org/
#
# We value your feedback. However, to provide you with the best support,
@@ -177,15 +177,15 @@ s|||igU
#################################################################################
#
-# refresh-tags: Kill automatic refresh tags (for dial-on-demand setups).
+# refresh-tags: Kill automatic refresh tags if refresh time is larger than 9 seconds.
#
#################################################################################
-FILTER: refresh-tags Kill automatic refresh tags (for dial-on-demand setups).
+FILTER: refresh-tags Kill automatic refresh tags if refresh time is larger than 9 seconds.
# Note: Only deactivates refreshes with more than 9 seconds delay to
# preserve monster-stupid but common redirections via meta tags.
#
-s/\2]*))?\2/\2]*))?\2@ tags to make the banners-by-* filters more effective.
# In the first step src is moved to the start, then width is moved to the second
-# place to guarantee an order of src, width, height.
+# place to guarantee an order of src, width, height. Also does some white-space
+# normalization.
+#
# This makes banners-by-size more effective and allows both banners-by-size
# and banners-by-link to preserve the original image URL in the title attribute.
-s|]*) src\s*=\s*(['"])([^>\\\2]+)\2|
]*) src\s*=\s*([^'">\\\s]+)|
]*)\ssrc\s*=\s*(['"])([^>\\\2]+)\2|
]*)\ssrc\s*=\s*([^'">\\\s]+)|
]+height)\s*=\s*|$1=|sig
-s|
\\\\2]*\2\|[^'">\\\s]+?))([^>]*)\s+width\s*=\s*(["']?)(\d+?)\4|
\\\\2]*\2\|[^'">\\\s]+?))([^>]*)\s+width\s*=\s*((["']?)\d+?\5)(?=[\s>])|
\1\s]*?(?:\
adclick # See www.dn.se \
| advert # see dict.leo.org \
| atwola\.com/(?:link|redir) # see www.cnn.com \
-| /jump/ # redirs for doublecklick.net ads \
+| doubleclick\.net/jump/ # redirs for doublecklick.net ads \
| counter # common \
| (?)/$1ädchen/Ug
# Pages are "blocked" based on keyword matching.
#
#################################################################################
-FILTER: crude-parental Crude parental filtering. Note that this filter doesn't work reliable.
+FILTER: crude-parental Crude parental filtering. Note that this filter doesn't work reliably.
# (Note: Middlesex, Sussex and Essex are counties in the UK, not rude words)
# (Note #2: Is 'sex' a rude word?!)
@@ -458,7 +461,7 @@ s+^.*warez.*$+