X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=default.filter;h=5a629c3a49b9bc1a6543b46eba0856259b509a62;hb=9c8724b5e111018b50b869f16d531d810ae6d2d5;hp=22a8cf7fdee121788d6de3b266f12606321e6934;hpb=3b08b65b6103086b92bd35d1a3d22bcd247691b5;p=privoxy.git diff --git a/default.filter b/default.filter index 22a8cf7f..5a629c3a 100644 --- a/default.filter +++ b/default.filter @@ -2,11 +2,11 @@ # # File : $Source: /cvsroot/ijbswa/current/default.filter,v $ # -# $Id: default.filter,v 1.54 2007/12/31 19:11:31 fabiankeil Exp $ +# $Id: default.filter,v 1.71 2009/03/01 18:33:17 ler762 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-2009 the # Privoxy team. http://www.privoxy.org/ # # We value your feedback. However, to provide you with the best support, @@ -219,14 +219,17 @@ s/\starget\s*=\s*(['"]?)_?(blank|new)\1?/ /ig # (X)HTML FILTER: img-reorder Reorder attributes in 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.*$+