X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=default.action.master;h=5100c422ca6e614fed66498e8d23f0cbb9338a1f;hb=5d34a784806787de86fe013e956117295a174548;hp=4f4979a39022c6b69a7c3892d16b87b9f32b4bb7;hpb=083bed54a3e81eb5053aca745b3bf05d90fad622;p=privoxy.git

diff --git a/default.action.master b/default.action.master
index 4f4979a3..5100c422 100644
--- a/default.action.master
+++ b/default.action.master
@@ -11,7 +11,7 @@
 #
 #  File        :  $Source: /cvsroot/ijbswa/current/default.action.master,v $
 #
-#  $Id: default.action.master,v 1.190 2009/09/18 17:33:02 fabiankeil Exp $
+#  $Id: default.action.master,v 1.196 2010/01/16 20:23:28 fabiankeil Exp $
 #
 #  Requires    :  This version requires Privoxy v3.0.11 or later due to
 #                 syntax changes.
@@ -23,7 +23,7 @@
 #                 and enhancements are better placed in user.action,
 #                 the match-all section has been moved to match-all.action.
 #
-#  Copyright   :  Written by and Copyright (C) 2001-2009 the
+#  Copyright   :  Written by and Copyright (C) 2001-2010 the
 #                 Privoxy team. http://www.privoxy.org/
 #
 #  Note: Updated versions of this file will be made available from time
@@ -749,6 +749,17 @@ support./(.*/)?track
 #MASTER# REMARKS: Added "text" 20070730 as per http://www.pcworld.com/textad?Keywords=System Resources Tune-Up.&type=pcworld_downloads_search&count=3&ord=906010128&serveUrl=http%3A%2F%2Fwww.pcworld.com%2Fdownloads%2Ffile%2Ffid%2C7661-order%2C1-page%2C1-c%2Csystemresourcestuneup%2Fdescription.html Adam Piggott
 /.*(top|bottom|left|right|text)_?ad
 
+#############################################################################
+# Catch-all exceptions
+#############################################################################
+{-block}
+# Sticky Actions = -block
+
+#MASTER# REMARKS: Actionsfile feedback item #2933856  2010-01-17 16:59
+#MASTER# REMARKS: Allow URLs containing DektopAdmin (matches .*top_?ad)
+# URL = http://support.apple.com/downloads/DL985/en_US/RemoteDesktopAdmin332.dmg
+/.*desktopadmin
+
 #############################################################################
 # Site-specific block patterns;
 #############################################################################
@@ -918,7 +929,9 @@ static.lycos-europe.net
 #MASTER# Remark: nothing but "sponsored listings"
 # Blocked URL = http://bcc.co.uk/
 bcc.co.uk/
-
+# Blocked URL = http://fusion.adtoma.com:80/125AFFE801/1DC59C7801.swf
+# Blocked URL = http://fusion.adtoma.com/1254D5CC01/1E43C76801.jpg
+fusion.adtoma.com/
 
 
 #----------------------------------------------------------------------------
@@ -1237,6 +1250,10 @@ img.directtrack.com
 .pclick.yahoo.com/images/
 # Blocked URL = http://rover.ebay.com/ar/1/2/3?mpt=123&adtype=1&size=728x90
 /.*\&adtype=
+# Blocked URL = http://resources.parfym.se/tradedoubler/250x360.swf
+/tradedoubler/.*\.swf
+# Blocked URL = http://hstse.tradedoubler.com/file/142609/440x220.swf
+hstse.tradedoubler.com/.*\.swf
 
 #----------------------------------------------------------------------------
 # Cross-site user tracking
@@ -1676,7 +1693,21 @@ lads.myspacecdn.com/
 #MASTER# REMARKS: Actionfile tracker ID: 2838501:  2009-08-16
 # URL = http://new.meteo.pl/advajax.js
 .meteo.pl/advajax\.js
-
+# URL = http://www.adressa.no/
+# URL = http://adressa.no/
+adressa.no/
+# URL = http://www.adresseavisen.no/
+# URL = http://adresseavisen.no/
+adresseavisen.no/
+# URL = http://apps.facebook.com/onthefarm/track.php?creative=&cat=friendvisit&subc
+at=weeds&key=a789a971dc687bee4c20c044834fabdd&next=index.php%3Fref%3Dnotif%
+26visitId%3D898835505
+.facebook.com/.*/track.php
+# URL = http://www.ifdb.tads.org/
+# URL = http://www.tads.org/
+.tads.org/
+# URL = http://adtoma.com/
+adtoma.com/
 
 
 #############################################################################
@@ -2009,6 +2040,8 @@ javabog.dk/ijk/
 .fsfe.org/
 # URL = http://www.couchsurfing.com/mapsurf.html
 .couchsurfing.com/
+# URL = http://www.couchsurfing.org/mapsurf.html
+.couchsurfing.org/
 
 {-filter{banners-by-link}}
 # Sticky Actions = -filter{banners-by-link}