X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=default.filter;h=8fa455b8f5176ae2940738a50c6551811af0c5cf;hp=9476c048f96060ac04e00fd8a9e3cd5eceea9d1e;hb=f3616f2012ca291e81b33dfc716892d54ad8fde3;hpb=ae6c3b5f3151ab577558d809f817dd121ca9aab0 diff --git a/default.filter b/default.filter index 9476c048..8fa455b8 100644 --- a/default.filter +++ b/default.filter @@ -2,7 +2,7 @@ # # File : $Source: /cvsroot/ijbswa/current/default.filter,v $ # -# $Id: default.filter,v 1.64 2008/07/12 15:49:09 fabiankeil Exp $ +# $Id: default.filter,v 1.67 2008/08/06 17:38:06 fabiankeil Exp $ # # Purpose : Rules to process the content of web pages # @@ -219,12 +219,15 @@ 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>])|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\ @@ -622,7 +625,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 @@ -830,6 +835,19 @@ s@^X-Privoxy-Control:.*@@i # # Revisions : # $Log: default.filter,v $ +# 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 '>',