Bump copyright

[privoxy.git] / default.action.master

diff --git a/default.action.master b/default.action.master
index 92f486b..7b33f95 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.323 2015/12/27 16:40:40 fabiankeil Exp $
+#  $Id: default.action.master,v 1.333 2017/03/27 10:19:19 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-2017 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 \
@@ -690,6 +693,8 @@ linuxcounter.net/
 adina*.
 # URL = http://adelelimedesign.deviantart.com/
 adele*.
+# URL = http://adlibris.com/
+adlibris.
 
 #############################################################################
 # Generic block patterns by path:
@@ -1492,7 +1497,7 @@ b.collective-media.net/
 # Blocked URL = http://spiegel.ivwbox.de/cgi-bin/ivw/CP/1001;/home/c-18/be-PB64-aG9tZXBhZ2UvY2VudGVy/szwprofil-1001
 #MASTER# BLOCK-REFERRER: http://www.heise.de/
 # Blocked URL = http://heise.ivwbox.de/2004/01/survey.js
- .ivwbox.de/
+.ivwbox.de/
 
 #----------------------------------------------------------------------------
 # Specific counters (see above for generic patterns)
@@ -1935,6 +1940,11 @@ adn.speedtest.net
 .deutschlandradiokultur.de/
 # URL = http://klikki.fi/adv/wordpress2.html
 klikki.fi/adv/
+#MASTER# UNBLOCK-REFERRER: http://www.ardmediathek.de/tv
+# URL = http://www.ardmediathek.de/ard/static/img/ardmt/banner/ard-mediathek.svg
+.ardmediathek.de/
+# URL = http://adventofcode.com/
+adventofcode.com/
 
 
 #############################################################################
@@ -2120,6 +2130,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
@@ -2289,6 +2301,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}
@@ -2548,7 +2562,28 @@ TAG:^IMAGE-REQUEST$
 #############################################################################
 # Depends on +client-header-tagger{css-requests}
 #############################################################################
-{+handle-as-empty-document \
+{-filter{html-annoyances} \
+ -filter{content-cookies} \
+ -filter{refresh-tags} \
+ -filter{img-reorder} \
+ -filter{banners-by-size} \
+ -filter{banners-by-link} \
+ -filter{webbugs} \
+ -filter{tiny-textforms} \
+ -filter{frameset-borders} \
+ -filter{iframes} \
+ -filter{demoronizer} \
+ -filter{shockwave-flash} \
+ -filter{quicktime-kioskmode} \
+ -filter{fun} \
+ -filter{crude-parental} \
+ -filter{site-specifics} \
+ -filter{no-ping} \
+ -filter{google} \
+ -filter{yahoo} \
+ -filter{msn} \
+ -filter{blogspot} \
+ +handle-as-empty-document \
  -handle-as-image \
 }
 TAG:^CSS-REQUEST$
@@ -2580,4 +2615,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