X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=default.action.master;h=496c481b70ae015aba12a76c5002a3f0ce19b16d;hp=ff92a5bff4108cec53dde07a80b06b5823b80450;hb=a60c12e2f53258709445f927dd00124b95d71015;hpb=df7b9dfa5a63d219076ce5834c4288441797071f

diff --git a/default.action.master b/default.action.master
index ff92a5bf..496c481b 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.318 2015/02/21 18:56:34 fabiankeil Exp $
+#  $Id: default.action.master,v 1.327 2016/03/27 16:54:05 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-2013 the
+#  Copyright   :  Written by and Copyright (C) 2001-2016 the
 #                 Privoxy team. http://www.privoxy.org/
 #
 # Feedback welcome, for details please have a look at:
@@ -550,6 +550,7 @@ 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} \
++client-header-tagger{range-requests} \
 +hide-from-header{block} \
 +set-image-blocker{pattern} \
 }
@@ -563,6 +564,7 @@ standard.Cautious
 +change-x-forwarded-for{block} \
 +client-header-tagger{css-requests} \
 +client-header-tagger{image-requests} \
++client-header-tagger{range-requests} \
 +deanimate-gifs{last} \
 +filter{refresh-tags} \
 +filter{img-reorder} \
@@ -592,6 +594,7 @@ standard.Medium
 +change-x-forwarded-for{block} \
 +client-header-tagger{css-requests} \
 +client-header-tagger{image-requests} \
++client-header-tagger{range-requests} \
 +crunch-if-none-match \
 +crunch-outgoing-cookies \
 +crunch-incoming-cookies \
@@ -1142,6 +1145,19 @@ cltomedia.info/delivery/
 .adexprt.com/
 # Blocked URL = http://data.gosquared.com/pv?a=GSN-311503-M&cs=UTF-8&cd=24&fl=11.7%20r700&je=0&la=de-de&sw=1280&sh=1024&dm=adn.speedtest.net&pa=%2F&pt=Speedtest.net%20-%20Der%20Globale%20Breitband-Geschwindigkeitstest&pr=http%3A&po=-&pl=0&tl=82&ri=1&ru=http%3A%2F%2Fadn.speedtest.net%2F&ui=1876309225&re=1&vi=1&pv=5&lv=1369129426&vw=1280&vh=878&dw=1263&dh=1325&st=0&sl=0&tv=4.0
 data.gosquared.com/
+# Blocked URL = http://resources.infolinks.com/js/infolinks_main.js
+resources.infolinks.com/
+#MASTER# BLOCK-REFERRER: http://www.libertaddigital.com/
+# Blocked URL = http://abs.proxistore.com/abe/js/psuniversaltag.js?v=
+abs.proxistore.com/abe/
+#MASTER# BLOCK-REFERRER: http://www.libertaddigital.com/
+# Blocked URL = http://rtax.criteo.com/delivery/rta/rta.js?netId=
+rtax.criteo.com/
+static.criteo.net/
+static.criteo.com/
+static.*.criteo.net/
+cas.*.criteo.com/
+cas.criteo.com/
 
 
 #----------------------------------------------------------------------------
@@ -1920,6 +1936,8 @@ adn.speedtest.net
 #MASTER# UNBLOCK-REFERRER: http://www.deutschlandradiokultur.de/
 # URL = http://www.deutschlandradiokultur.de/themes/dradio/js.php?files=script/jquery-2.0.2.min.js,script/dkultur.script.js,script/jquery.bxslider.js,script/jquery.cookie.js,script/aod/jquery.mkdraod.interface.js,script/drk-audioplayer.js,script/mobileView.js,script/popup.js&16975
 .deutschlandradiokultur.de/
+# URL = http://klikki.fi/adv/wordpress2.html
+klikki.fi/adv/
 
 
 #############################################################################
@@ -2105,6 +2123,8 @@ ixquick-proxy.com/
 yandex.ru/.*&retpath=http
 # URL = http://mc.yandex.ru/clmap/10630330?page-url=http%3A%2F%2Fyandex.ru%2Fshowcaptcha%3Fcc%3D1%26retpath%3Dhttp%253A%2F%2Fyandex.ru%2Fyandsearch%253Ftext%253Dgeli%252Bfreebsd%2526lr%25...faf28502&pointer-click=rn%3A121707220%3Ax%3A17873%3Ay%3A46420%3At%3A54%3Ap%3APA%5Db%5C%5BFA2A%5D2b%5C%5B1&browser-info=rqnl%3A2%3Ast%3A1423317904
 .yandex.ru/.*\?page-url=
+# URL = http://disqus.com/forums/daemonicdispatches/get_num_replies.js?url8=http%3A%2F%2Fwww.daemonology.net%2Fblog%2F2014-12-25-when-security-goes-right.html%23disqus_thread&
+disqus.com/
 
 {+redirect{s@.*url=@http://@} -block}
 # Sticky Actions = +redirect -block
@@ -2274,6 +2294,8 @@ creativecommons.org/
 kggp.de/
 # URL = http://www.plasmaservice.de/interviews/interviews_kln/interview_koeln_christmann.htm
 .plasmaservice.de/
+# URL = http://www.black-mosquito.org/index.php/kein-mensch-ist-illegal-fight-racism-now-40-aufkleber.html
+.black-mosquito.org/
 
 {-filter{banners-by-link}}
 # Sticky Actions = -filter{banners-by-link}
@@ -2565,4 +2587,13 @@ TAG:^CSS-REQUEST$
 }
 TAG:^(application|text)/(x-)?javascript$
 
+# Disable filtering for Range requests.
+#
+# With filtering enabled Privoxy would remove the Range headers
+# to be able to filter the whole response. The downside is that
+# it prevents clients from resuming downloads or skipping over
+# parts of multimedia files.
+{-filter -deanimate-gifs}
+TAG:^RANGE-REQUEST$
+
 #MASTER# set vi:nowrap