No Warez

X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=default.filter;h=8fa455b8f5176ae2940738a50c6551811af0c5cf;hp=7fcae8771d98d130a445246c796d4561e2f8fb45;hb=87f5a2bd34a2708ce34d72a2025425e5ae1931da;hpb=9d4711dd8724931686e0033fe41576079a5709b6 diff --git a/default.filter b/default.filter index 7fcae877..8fa455b8 100644 --- a/default.filter +++ b/default.filter @@ -2,11 +2,11 @@ # # File : $Source: /cvsroot/ijbswa/current/default.filter,v $ # -# $Id: default.filter,v 1.59 2008/04/23 16:18:18 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 # -# Copyright : Written by and Copyright (C) 2001 - 2007 the +# Copyright : Written by and Copyright (C) 2001-2008 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ä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.*$+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 @@ -737,7 +742,7 @@ s@^(Content-Type:)\s(?:message/(?:news|rfc822)|text/x-.|application/x-sh(?:\s| ################################################################################# CLIENT-HEADER-TAGGER: image-requests Tags detected image requests as "IMAGE-REQUEST". -s@Accept:\simage/.@IMAGE-REQUEST@i +s@^Accept:\simage/.@IMAGE-REQUEST@i ################################################################################# # @@ -747,7 +752,7 @@ s@Accept:\simage/.@IMAGE-REQUEST@i ################################################################################# CLIENT-HEADER-TAGGER: css-requests Tags detected CSS requests as "CSS-REQUEST". -s@Accept:\stext/css.@CSS-REQUEST@i +s@^Accept:\stext/css.@CSS-REQUEST@i ################################################################################# # @@ -801,7 +806,7 @@ s@^User-Agent:.@$0@i ################################################################################# SERVER-HEADER-TAGGER: content-type Tags the request with the content type declared by the server. -s@^Content-Type:\s([^;]).@$1@i +s@^Content-Type:\s([^;]+).@$1@i ################################################################################# # @@ -830,6 +835,40 @@ 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 '>', +# 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. +# +# Revision 1.62 2008/06/21 17:02:03 fabiankeil +# Fix typo. +# +# Revision 1.61 2008/05/21 18:44:43 fabiankeil +# - Let the content-type tagger ignore headers without value. +# - Remove a few unused lines at the end of the file. +# +# Revision 1.60 2008/04/26 10:36:41 fabiankeil +# Let the msn filter hide another class. +# # Revision 1.59 2008/04/23 16:18:18 fabiankeil # s@declarded@declared@ # @@ -1228,7 +1267,3 @@ s@^X-Privoxy-Control:.*@@i # Revision 1.6 2001/06/09 14:01:57 swa # header. cosmetics. default: no messing ala microsuck. # -# -# - -