X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=default.filter;h=0821ae370390c79711f4b0ceca0582d8ce662f4e;hp=2a791f3d7e11701294801387bf3245cf440d689a;hb=42a63263b2fec9d1cb5118ec1d5b0f799f08b45c;hpb=f87b64cffde60dba04f5ed46dfad6be133f9ee3f diff --git a/default.filter b/default.filter index 2a791f3d..0821ae37 100644 --- a/default.filter +++ b/default.filter @@ -2,11 +2,11 @@ # # File : $Source: /cvsroot/ijbswa/current/default.filter,v $ # -# $Id: default.filter,v 1.63 2008/06/27 12:53:41 fabiankeil Exp $ +# $Id: default.filter,v 1.70 2009/02/21 13:01:51 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-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+?\5[\s>])|\\\\2]*\2\|[^'">\\\s]+?))([^>]*)\s+width\s*=\s*((["']?)\d+?\5)(?=[\s>])|No Warez

You're not sea # Remove by description s/^.*\ -(?:(suck|lick|tounge|rub|fuck|fingering|finger|chicks?)\s*)?\ +(?:(suck|lick|tongue|rub|fuck|fingering|finger|chicks?)\s*)?\ (?:(her|your|my|hard|with|big|wet|tight|pink|hot|moist|young|teen)\s*)+\ (dicks?|penis|cocks?|balls?|tits?|pussy|cunt|clit|ass|mouth).*$\ /This page has been blocked by Privoxy's crude-parental content filter\ @@ -597,10 +600,14 @@ s@@\n\n$0@ + \#composebox \#compose_editorArea {width: 70% !important; /* reasonably sized reply textarea please */\n\ + \n$0\n@ + +s@(]*)width:545px;@$1width:70%;@isU ################################################################################# # @@ -622,7 +629,9 @@ s@@\n$0@ +# Are these ids still in use? s@(]*) id=(["']?)ads_[^\2]*\2@$1 class="msn_ads"@Uig +s@(]*) class=(["']?)sb_ads[^\2]*\2@$1 class="msn_ads"@Uig s@(]*href=\")http://g.msn.com/.*\?(http://.*)(&&DI=.*)(\")@$1$2$4@Ug s@(]*)gping=\".*\"@$1 title="URL cleaned up by Privoxy's msn filter"@Ug @@ -657,7 +666,8 @@ s@(
([^\s]*).*?\.\.\.\s*(\1)@$2@ig +s@([^<]*)(?:\.\.\.)?\s*\s*\ +(\s*\1)@$2@ig ################################################################################# # @@ -830,6 +840,35 @@ s@^X-Privoxy-Control:.*@@i # # Revisions : # $Log: default.filter,v $ +# Revision 1.70 2009/02/21 13:01:51 fabiankeil +# Make blogspot's feed magic slightly more reliable. +# +# Revision 1.69 2009/02/12 15:40:11 ler762 +# more yahoo email ad blocking +# +# Revision 1.68 2008/09/19 13:26:04 fabiankeil +# s@tounge@tongue@. Anonymously reported in #1648657. +# +# Revision 1.67 2008/08/06 17:38:06 fabiankeil +# In banners-by-size, make sure white-space around the height +# attribute is removed as well and replace two spaces with +# "\s" so we don't get fooled by tabs. Fixes #2036125. +# +# Revision 1.66 2008/08/03 17:27:47 fabiankeil +# Teach msn filter to catch a few new ad classes. +# +# Revision 1.65 2008/07/21 13:43:44 fabiankeil +# Fix img-reorder regression introduced with my last commit. +# Some tags were terminated too soon, letting the browser render +# some of their arguments as text. Oops. +# +# Revision 1.64 2008/07/12 15:49:09 fabiankeil +# - Don't let img-reorder touch width attributes +# that aren't followed by either whitespace or '>', +# as those usually indicate onclick nonsense. +# Problem and solution reported by Glenn Washburn in #2014552. +# - While at it, don't use more groups than necessary. +# # Revision 1.63 2008/06/27 12:53:41 fabiankeil # Make sure the taggers css-requests and image-requests # only match at the beginning of the header.