Add missing protocol in block tests.

[privoxy.git] / default.action.master

diff --git a/default.action.master b/default.action.master
index 929328f..5f8408d 100644 (file)
--- 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.212 2010/03/27 16:13:28 ler762 Exp $
+#  $Id: default.action.master,v 1.218 2010/05/23 11:20:48 fabiankeil Exp $
 #
 #  Requires    :  This version requires Privoxy v3.0.11 or later due to
 #                 syntax changes.
@@ -681,6 +681,7 @@ metrics.
 # Generic unblockers by host:
 #############################################################################
 {-block}
+# Sticky Actions = -block
 adsl.
 ad[udmw]*.
 adbl*.
@@ -697,6 +698,9 @@ adventure*.
 .*[epu]ad*.
 county*.
 countr*.
+#MASTER# REMARKS: We still like tor
+# URL = http://metrics.torproject.org/consensus-graphs.html
+metrics.torproject.org/
 
 #############################################################################
 # Generic block patterns by path:
@@ -918,10 +922,11 @@ static.lycos-europe.net
 #MASTER# BLOCK-REFERRER: http://hitta.se
 # Blocked URL = http://82.99.18.195/media.1/112/9460/146016/150x175_Hitta_FV_Feb08.gif
 82.99.18.195
-#MASTER# REMARKS: Actionsfile feedback item #1888197  2008-02-06
-#MASTER# REMARKS: Have a "go there anyway" link for clk.atdmt.com
+#MASTER# REMARKS: Actionsfile feedback item #1888197 and #2975927.
+#MASTER# REMARKS: Have a "go there anyway" link for clk.atdmt.com and view.atdmt.com.
 #MASTER# BLOCK-REFERRER: http://www.networkworld.com/resourcelibrary/?tid=4&type=special%20report
 # Blocked URL = http://clk.atdmt.com/
+# Blocked URL = http://view.atdmt.com/action/mrtiwy_FY10Office2010BetaHomeandBiz1_1
 .atdmt.com/
 #MASTER# REMARKS: Actionsfile feedback item #2723873 2009-04-01
 #MASTER# BLOCK-REFERRER: http://www.news.software.coop/paralysed-perl-package-problem/602/
@@ -1004,7 +1009,7 @@ stats.reinvigorate.net/
 # Blocked URL = http://media.adrevolver.com/adrevolver/trace?sip=123&cpy=123
 media.adrevolver.com/
 #MASTER# REMARKS: Actionsfile feedback item #2975895 2010-03-24
-# Blocked URL = static.chartbeat.com/js/chartbeat.js
+# Blocked URL = http://static.chartbeat.com/js/chartbeat.js
 .chartbeat.com/(.*/)?chartbeat\.js$
 
 
@@ -1037,6 +1042,9 @@ stats./c?rc/.*/uc.gif
 stats./.*\.gif\?
 # Blocked URL = http://ad.yieldmanager.com/pixel?id=123456&t=2
 .yieldmanager.com/pixel\?
+# Blocked URL = http://a.analytics.yahoo.com/p.pl?a=1000226660965&js=no
+# Blocked URL = http://s.analytics.yahoo.com/fpc.pl?a=1000461640983&v=4.43&enc=utf-8&f=http%3A//www.zoover.nl/nederland/limburg/maasbracht/weer%23tabs&b=Het%20Weer%20in%20Maasbracht.%20Bekijk%20Weersverwachting%20van%20Maasbracht%20%7C%20Zoover%23tabs&flv=WIN%2010%2C0%2C45%2C2&d=Mon%2C%2017%20May%202010%2014%3A09%3A26%20UTC&n=-2&g=nl&h=Y&j=1440x900&k=32&l=true&ittidx=0&fpc=uP04C7j4%7ClaDQjglKaa%7Cfses1000461640983%3D%7CkbSSgv6Jaa%7CuP04C7j4%7Cfvis1000461640983%3DZj1odHRwJTNBLy93d3cuem9vdmVyLm5sLyZiPVpvb3ZlciUyMCU3QyUyMFZha2FudGllYmVvb3JkZWxpbmdlbiUyMHZvb3IlMjBlbiUyMGRvb3IlMjByZWl6aWdlcnM%3D%7C8sHTYo10oM%7C8sHTYo10oM%7C8sHTYo10oM%7CT%7C8sHTYo10oM%7C8sHTYo10oM
+.analytics.yahoo.com
 
 #----------------------------------------------------------------------------
 # JavaScripts and Texts for ad and popup generation
@@ -1150,9 +1158,9 @@ bs*.einets.com
 #MASTER# BLOCK-REFERRER: http://salon.com/ 10/19/06
 #MASTER# BLOCK-REFERRER: http://maps.yahoo.com/
 #MASTER# REMARKS: Banner farms; just exclude their corp. info
-#MASTER# REMARKS: and have a "go there anyway" link for clk.atdmt.com
-#MASTER# REMARKS:   (Actionsfile feedback item #1888197)
-[abd-vx-z]*.atdmt.com/
+#MASTER# REMARKS: and have a "go there anyway" link for clk.atdmt.com and view.atdmt.com
+#MASTER# REMARKS:   (Actionsfile feedback item #1888197 and #2975927)
+[abd-ux-z]*.atdmt.com/
 #MASTER# BLOCK-REFERRER: http://www.exactaudiocopy.de/ 09/11/06
 #MASTER# BLOCK-REFERRER: http://stanford.facebook.com/home.php
 # URL = http://www.fastclick.net/
@@ -1371,6 +1379,8 @@ track.webtrekk.de/
 #MASTER# BLOCK-REFERER: https://sourceforge.net/
 # URL = http://b.scorecardresearch.com/p2?c1=2&c2=6035546&c3=&c4=&c5=&c6=&c15=&cj=1
 b.scorecardresearch.com/
+# URL = https://sb.scorecardresearch.com/
+sb.scorecardresearch.com/
 
 #----------------------------------------------------------------------------
 # Specific counters (see above for generic patterns)