X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=default.filter;h=0d6b8145b9eba386171bc122593d1158dc1e7353;hb=2966c5c92e16a7c3590da40a9be4741eec62c80b;hp=7fcae8771d98d130a445246c796d4561e2f8fb45;hpb=9d4711dd8724931686e0033fe41576079a5709b6;p=privoxy.git
diff --git a/default.filter b/default.filter
index 7fcae877..0d6b8145 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.66 2008/08/03 17:27:47 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?!)
@@ -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:\s*image/.*@IMAGE-REQUEST@i
+s@^Accept:\s*image/.*@IMAGE-REQUEST@i
#################################################################################
#
@@ -747,7 +752,7 @@ s@Accept:\s*image/.*@IMAGE-REQUEST@i
#################################################################################
CLIENT-HEADER-TAGGER: css-requests Tags detected CSS requests as "CSS-REQUEST".
-s@Accept:\s*text/css.*@CSS-REQUEST@i
+s@^Accept:\s*text/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,35 @@ s@^X-Privoxy-Control:.*@@i
#
# Revisions :
# $Log: default.filter,v $
+# 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 +1262,3 @@ s@^X-Privoxy-Control:.*@@i
# Revision 1.6 2001/06/09 14:01:57 swa
# header. cosmetics. default: no messing ala microsuck.
#
-#
-#
-
-