X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=default.filter;h=43f2ca088fa748cb7b7586ffd9b6d23fe2ccd851;hb=db060b1db41cdfbd29f4a7f94afee9888b688885;hp=aaeb57ea54c523bb12453ee330090cdeca2374be;hpb=6309349be5217cdadf380941485c463bf9dcd72e;p=privoxy.git
diff --git a/default.filter b/default.filter
index aaeb57ea..43f2ca08 100644
--- a/default.filter
+++ b/default.filter
@@ -2,11 +2,11 @@
#
# File : $Source: /cvsroot/ijbswa/current/default.filter,v $
#
-# $Id: default.filter,v 1.72 2009/05/16 13:27:20 fabiankeil Exp $
+# $Id: default.filter,v 1.85 2012/04/22 12:17:08 fabiankeil Exp $
#
# Purpose : Rules to process the content of web pages
#
-# Copyright : Written by and Copyright (C) 2001-2009 the
+# Copyright : Written by and Copyright (C) 2001-2010 the
# Privoxy team. http://www.privoxy.org/
#
# We value your feedback. However, to provide you with the best support,
@@ -128,15 +128,15 @@ s/(open\s*\([^\)]+always(?:raised|lowered)=)(["']?)(?:yes|1)\2/$1$2no$2/sigU
#################################################################################
#
-# js-events: Kill all JS event bindings and timers (Radically destructive! Only for extra nasty sites).
+# js-events: Kill JavaScript event bindings and timers (Radically destructive! Only for extra nasty sites).
#
#################################################################################
-FILTER: js-events Kill all JS event bindings and timers (Radically destructive! Only for extra nasty sites).
+FILTER: js-events Kill JavaScript event bindings and timers (Radically destructive! Only for extra nasty sites).
s/(on|event\.)((mouse(over|out|down|up|move))|(un)?load|contextmenu|selectstart)/never/ig
# Not events, but abused on the same type of sites:
s/(alert|confirm)\s*\(/concat(/ig
-s/settimeout\(/concat(/ig
+s/set(timeout|interval)\(/concat(/ig
#################################################################################
#
@@ -177,15 +177,15 @@ s|||igU
#################################################################################
#
-# refresh-tags: Kill automatic refresh tags (for dial-on-demand setups).
+# refresh-tags: Kill automatic refresh tags if refresh time is larger than 9 seconds.
#
#################################################################################
-FILTER: refresh-tags Kill automatic refresh tags (for dial-on-demand setups).
+FILTER: refresh-tags Kill automatic refresh tags if refresh time is larger than 9 seconds.
# Note: Only deactivates refreshes with more than 9 seconds delay to
# preserve monster-stupid but common redirections via meta tags.
#
-s/\2]*))?\2/\2]*))?\2@]*)frameborder=(['"]?)(no|0)\2/$1/igU
s/(]*)scrolling=(['"]?)(no|0)\2/$1/igU
+#################################################################################
+#
+# iframes: Remove all detected iframes. Should only be enabled for
+# individual sites after testing that the iframes are optional.
+#
+#################################################################################
+FILTER: iframes Removes all detected iframes. Should only be enabled for individual sites.
+s@@@Uisg
+
#################################################################################
#
@@ -422,7 +431,7 @@ FILTER: fun Text replacements for subversive browsing fun!
# SCNR
#
-s/microsoft(?!.[^\s])/MicroSuck/ig
+s/microsoft(?!\.[^\s])/MicroSuck/ig
# Buzzword Bingo (example for extended regex syntax)
#
@@ -575,12 +584,14 @@ s@(]*?)\sping=(['"]?)([^"'>]+)\2([>\s]?)@\
#################################################################################
FILTER: google CSS-based block for Google text ads. Also removes a width limitation and the toolbar advertisement.
-s@@\n$0@
+ .main_body, .j, \#res, .med, .hd, .g, .s\n\
+ {width: 99%; max-width: 100%; margin-left: 0; margin-right: 0;}\n\
+ \n$0@
s@