X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=default.filter;h=72ec7a2e8d67de83c0bb2c7cc4a6273eeb5f802b;hb=7ae12b2afe7124cc23216f76aec2acdd5c085595;hp=db81aecab29e782916ed5552a258c252256ede80;hpb=061ac70d63069a792a42aa46b3dec1ae78825e14;p=privoxy.git diff --git a/default.filter b/default.filter index db81aeca..72ec7a2e 100644 --- a/default.filter +++ b/default.filter @@ -2,11 +2,11 @@ # # File : $Source: /cvsroot/ijbswa/current/default.filter,v $ # -# $Id: default.filter,v 1.60 2008/04/26 10:36:41 fabiankeil Exp $ +# $Id: default.filter,v 1.81 2011/06/23 13:58:53 fabiankeil Exp $ # # Purpose : Rules to process the content of web pages # -# Copyright : Written by and Copyright (C) 2001-2008 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ä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.*$+