Bump copyright
[privoxy.git] / default.action.master
index 0572686..c46e950 100644 (file)
@@ -11,7 +11,7 @@
 #
 #  File        :  $Source: /cvsroot/ijbswa/current/default.action.master,v $
 #
-#  $Id: default.action.master,v 1.267 2012/12/14 10:15:17 fabiankeil Exp $
+#  $Id: default.action.master,v 1.278 2012/12/19 11:44:35 fabiankeil Exp $
 #
 #  Requires    :  This version requires Privoxy v3.0.11 or later due to
 #                 syntax changes.
 #                 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-2010 the
+#  Copyright   :  Written by and Copyright (C) 2001-2012 the
 #                 Privoxy team. http://www.privoxy.org/
 #
-#  Note: Updated versions of this file will be made available from time
-#        to time. Check http://sourceforge.net/project/showfiles.php?group_id=11118
-#        for updates and/or subscribe to the announce mailing list
-#        (http://lists.sourceforge.net/lists/listinfo/ijbswa-announce) if you
-#        wish to receive an email notice whenever updates are released.
-#
 # We value your feedback. However, to provide you with the best support,
 # please note:
 #
@@ -721,6 +715,8 @@ linuxcounter.net/
 #MASTER# BLOCK-REFERRER: http://thequietus.com/articles/10512-jo-dunne-fuzzbox-dies
 # Blocked URL = http://thequietus.com/openx/www/delivery/ck.php?n=ae777ee2&cb=INSERT_RANDOM_NUMBER_HERE
 /openx/www/delivery/
+# Blocked URL = http://mem.brandreachsys.com/www/delivery/lg.php?bannerid=13783&campaignid=0&zoneid=550&cb=f22df9acaa
+/.*bannerid=
 
 #############################################################################
 # Generic unblockers by path:
@@ -771,10 +767,20 @@ support./(.*/)?track
 # Sticky Actions = -block
 
 #MASTER# REMARKS: Actionsfile feedback item #2933856  2010-01-17 16:59
-#MASTER# REMARKS: Allow URLs containing DektopAdmin (matches .*top_?ad)
+#MASTER# REMARKS: Allow URLs containing DesktopAdmin (matches .*top_?ad)
 # URL = http://support.apple.com/downloads/DL985/en_US/RemoteDesktopAdmin332.dmg
 /.*desktopadmin
-
+# URL = http://www.rai.it/dl/RaiTV/popup/player_radio.html?v=9
+# URL = http://www.rai.tv/dl/RaiTV/popup/player_radio.html?v=9
+#MASTER# UNBLOCK-REFERRER: http://www.bbc.co.uk/programmes/b01mnyzd
+# URL = http://static.bbci.co.uk/radio/player/popup.js
+/(.*/)?(player|radio|tv|television).?pop
+/(.*/)?pop[-_]?(up|over|under|open(er)?)?s?(/|\.)(player|radio|tv|television)
+#MASTER# REMARKS: Actionsfile feedback item #3498129  2012-03-06 17:14
+#MASTER# REMARKS: Allows URLs containing the word 'download'
+#MASTER# UNBLOCK-REFERRER: http://munirihsparrow.bandcamp.com/track/lamp-lighted
+# URL = http://popplers5.bandcamp.com/download/track?enc=mp3-128&fsig=bad421a4c31dda49faceefb0f3923630&id=342903379&stream=1&ts=1355881937.0
+/.*download
 
 #----------------------------------------------------------------------------
 # Misc Web-bugs, JS and just plain Junk. Images here aren't normal images.
@@ -928,6 +934,8 @@ stats./.*\.gif\?
 #MASTER# BLOCK-REFERRER: http://www.aktivist.pl/
 # Blocked URL = http://go.idmnet.bbelements.com/please/showit/46/1/1/1/?typkodu=img&keywords=
 go.idmnet.bbelements.com/please/showit/
+# Blocked URL = http://gm-link.com/tm_image.asp?c=12345&x=0&u=email@address.tld&orc.gif
+gm-link.com/
 
 #############################################################################
 # Site-specific block patterns;
@@ -1146,8 +1154,7 @@ jlinks.industrybrains.com/
 #MASTER# REMARKS: Actionsfile feedback item #1736794 2007-06-13
 js.adsonar.
 #MASTER# BLOCK-REFERRER: http://news.zdnet.co.uk/software/0,1000000121,39209666,00.htm
-#MASTER# REMARKS: Actionsfile feedback item #1736879 2007-06-13, sponsored links. 2007-08-02, more hosts using this scheme, broadening scope.
-#bwp.zdnet.
+# Blocked URL = http://bwp.zdnet.com/search?dw-siteid=2&dw-ptid=2100&dw-edid=2&dw-ontid=800004
 bwp.
 # Blocked URL = http://us.mc123.mail.yahoo.com/mc/stampNonJs
 .yahoo.com/mc/stampNonJs
@@ -1360,6 +1367,8 @@ optimized-by.rubiconproject.com/
 # Blocked URL = http://g.adspeed.net/ad.php?do=html&zid=14678&wd=728&ht=90&target=_top
 #MASTER# BLOCK-REFERRER: http://seclists.org/fulldisclosure/2012/Aug/4
 g.adspeed.net/
+# Blocked URL = http://imp.double.net/?5463;234;4505;0;39296
+imp.double.net/
 
 #----------------------------------------------------------------------------
 # Cross-site user tracking
@@ -1738,7 +1747,7 @@ www.google.com/adsense/
 # URL = http://images.encyclopediadramatica.com/images/b/b5/Advertising-Dierentuin.jpg
 .encyclopediadramatica.com/
 #MASTER# UNBLOCK-REFERRER: http://lifehacker.com 2008-04-18 HB
-# URL = tags.gawker.com/assets/minify.php?files=/assets/base.v6/css/global.css,/assets/base.v6/css/header.css,/assets/base.v6/css/sidebar.css,/assets/base.v6/css/content.css,/assets/base.v6/css/images.css,/assets/base.v6/css/ads.css,/assets/base.v6/css/community.css,/assets/base.v6/css/comments.css,/assets/base.v6/css/messages.css,/assets/base.v6/css/ui.css
+# URL = http://tags.gawker.com/assets/minify.php?files=/assets/base.v6/.../comments.css,/assets/base.v6/css/messages.css,/assets/base.v6/css/ui.css
 tags.gawker.com/.*css$
 # URL = http://cgi.tnt.co.uk/TrackNTrace/quicktrack.asp
 .tnt.co.uk/TrackNTrace/
@@ -1864,12 +1873,12 @@ adjamblog.files.wordpress.com/
 .urbandictionary.com/popular
 # URL = http://websupport.wdc.com/sfclickcount.asp?s1=2&s2=1&s3=2&s4=6&lang=en&url=https%3A%2F%2Fwesterndigital.secure.force.com%2F%3Flang%3Den
 websupport.wdc.com/
-#MASTER# UNBLOCK-REFERRER: http://www.bbc.co.uk/programmes/b01mnyzd
-# URL = http://static.bbci.co.uk/radio/player/popup.js
-.bbci.co.uk/radio/
 #MASTER# UNBLOCK-REFERRER: http://conradelektronik.m13.mailplus.nl/genericservice/code/servlet/React?encId=xSgAxBFNnFrne8j&actId=357685&command=openhtml
 # URL = http://content.conrad.se/newsletter/banners/OFFER_750987_exk.jpg
 .conrad.se/newsletter/banners/
+#MASTER# REMARKS: Actionsfile feedback item #3413827  2011-09-25 12:11
+#MASTER# REMARKS: This domain hosts JS, images and CSS upon which hotmail.com depends
+.wlxrs.com/
 
 
 #############################################################################