projects / privoxy.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ijbswa-Feature Requests-3006719 - Block 160x578 Banners
[privoxy.git] / default.action.master
diff --git a/default.action.master b/default.action.master
index 95b7d28..29abb0d 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.208 2010/02/20 15:31:19 fabiankeil Exp $
+#  $Id: default.action.master,v 1.222 2010/05/23 11:54:54 fabiankeil Exp $
 #
 #  Requires    :  This version requires Privoxy v3.0.11 or later due to
 #                 syntax changes.
@@ -563,6 +563,8 @@ allow-ads   = -block -filter{banners-by-size} -filter{banners-by-link}
 #
 { \
 +change-x-forwarded-for{block} \
++client-header-tagger{css-requests} \
++client-header-tagger{image-requests} \
 +hide-from-header{block} \
 +set-image-blocker{pattern} \
 }
@@ -574,6 +576,8 @@ standard.Cautious
 #
 { \
 +change-x-forwarded-for{block} \
++client-header-tagger{css-requests} \
++client-header-tagger{image-requests} \
 +deanimate-gifs{last} \
 +filter{refresh-tags} \
 +filter{img-reorder} \
@@ -677,6 +681,7 @@ metrics.
 # Generic unblockers by host:
 #############################################################################
 {-block}
+# Sticky Actions = -block
 adsl.
 ad[udmw]*.
 adbl*.
@@ -693,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:
@@ -914,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/
@@ -932,7 +941,13 @@ 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/
-
+#MASTER# Remark: Actionsfile feedback item #2975895 2010-03-24
+# Blocked URL = http://ping.chartbeat.net/ping?h=uservoice.com&p=%2Fsuggestions%2Fping-chartbeat-net-sucks&u=3
+.chartbeat.net/(.*/)?ping\?
+# Blocked URL = http://s.atemda.com/Admeta.js
+# Blocked URL = http://atemda.com/ClickThrough.ashx?pId=9616&mId=14484&tId=634102151426089505&opS=1&admetac=mR3sJ3%2b9yleq%2bHowITh0hw%3d%3d
+#MASTER# BLOCK-REFERRER: http://www.startpagina.nl
+.atemda.com/
 
 #----------------------------------------------------------------------------
 # Misc Web-bugs, JS and just plain Junk. Images here aren't normal images.
@@ -997,6 +1012,16 @@ stats.reinvigorate.net/
 .quantserve.com
 # 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 = http://static.chartbeat.com/js/chartbeat.js
+.chartbeat.com/(.*/)?chartbeat\.js$
+# Blocked URL = http://js.adlink.net/js?lang=de&s=duesseldorf-international.de&z=home&d=1274103403564
+#MASTER# BLOCK-REFERRER: http://www.duesseldorf-international.de/
+js.adlink.net/
+#Blocked URL = nl.sitestat.com/rdw/rdw/s?www.nl.voertuigeigenaar.voertuigeigenaar&ns__t=1274099350343
+#MASTER# BLOCK-REFERRER: http://www.rdw.nl/nl/voertuigeigenaar/
+.sitestat.com/
+
 
 {+block{Might be a web-bug.} -handle-as-empty-document +handle-as-image}
 #MASTER# BLOCK-REFERRER: http://versiontracker.com and many others. 10/20/06
@@ -1027,6 +1052,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
@@ -1140,9 +1168,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/
@@ -1266,6 +1294,8 @@ hstse.tradedoubler.com/.*\.swf
 # Blocked URL = http://www.zdnetasia.com/2007/techguide/network/sponsor/i/logmein_mpu_whitepaper.gif
 # Blocked URL = http://www.zdnetasia.com/2007/techguide/network/sponsor/sidebar.gif
 www.zdnetasia.com/.*/sponsor/.*\.gif$
+# Blocked URL = http://pagead2.googlesyndication.com/pagead/imgad?id=CPjtipDs9taquQEQoAEYwgQyCIvo2PNnQywb
+.googlesyndication.com/.*/imgad\?
 
 #----------------------------------------------------------------------------
 # Cross-site user tracking
@@ -1361,6 +1391,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)
@@ -1741,7 +1773,9 @@ include.ebaystatic.com/.*omniture.*\.js
 # URL = http://l.yimg.com/d/combo?news/p/common/generic/ads-min-24248.css&news/p/common/generic/widgets-min-10270.css
 # URL = http://news.zdnet.com/css/z/ads/hs.css
 /.*\.css$
-
+#MASTER# REMARKS:Actionsfile feedback item #2974204 2010-03-21
+# URL = http://adesklets.sourceforge.net/
+adesklets.sourceforge.net/
 
 
 #############################################################################
@@ -1765,17 +1799,6 @@ images.apple.com
 #MASTER# REMARKS: Various reports 09/16/06. This site also requires pop-ups.
 mail.google.*
 
-#----------------------------------------------------------------------------
-# Semi-fragile, allow for blocks.
-#----------------------------------------------------------------------------
-{-crunch-all-cookies -filter -fast-redirects -hide-referrer}
-# Sticky Actions = -crunch-incoming-cookies -crunch-outgoing-cookies -filter -fast-redirects -hide-referrer
-# URL = http://adserver.yahoo.com/
-#MASTER# REMARKS: This is much too broad for my taste. It forces me to add
-#MASTER# REMARKS: a special yahoo section in my user.action file, just to
-#MASTER# REMARKS: confirm my defaults in default.action. fk 2007-01-19
-.yahoo.com
-
 #----------------------------------------------------------------------------
 # Shopping and banking sites - allow cookies and pop-ups
 #----------------------------------------------------------------------------
@@ -1844,14 +1867,13 @@ www.ukc.ac.uk/cgi-bin/wac\.cgi\?
 .speedfind.de
 #MASTER# PROBLEM-URL: http://www.nytimes.com/
 .nytimes.com
-#MASTER# REMARKS: Yahoo logout URL after first redirect. fk 2007-01-19
-#MASTER# REMARKS: Logout fails if we fast-redirect to the URL after "done=".
-#MASTER# REMARKS: Reported in support request #1635354.
+#MASTER# REMARKS: Disable fast-redirects for all of yahoo.com/.
+#MASTER# REMARKS: Apparently we can't keep up with maintaining more precise exceptions.
 # URL = http://login.yahoo.com/config/login?logout=1&.done=http://mail.yahoo.com&.src=ym&.intl=us
-.yahoo.com/.*done=http
+#MASTER# REMARKS: Reported in support request #1635354.
+# URL = http://us.rd.yahoo.com/reg/login1/lisu/login/uk/ym/*http://edit.europe.yahoo.com/c onfig/login?.tries=1&.src=ym&.md5=&.hash=&.js=1&.last=&...kP=Y&.done=http://mail .yahoo.com&.pd=ym_ver=0&c=&login=XXX&passwd=XXX&.persistent =&.hash=1&.md5=1.yahoo.com/
 #MASTER# REMARKS: Reported in support request #1802365.
-# URL = http://us.rd.yahoo.com/reg/login1/lisu/login/uk/ym/*http://edit.europe.yahoo.com/c onfig/login?.tries=1&.src=ym&.md5=&.hash=&.js=1&.last=&...kP=Y&.done=http://mail .yahoo.com&.pd=ym_ver=0&c=&login=XXX&passwd=XXX&.persistent =&.hash=1&.md5=1
-.rd.yahoo.com/reg/login1/
+.yahoo.com/
 # URL = http://validator.w3.org/check
 .w3.org
 #MASTER# PROBLEM-URL: http://www.ask.com/
The official Privoxy git repository