X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=default.action.master;h=eefa9c492f8dd01dacc1e70cb68e3204d916aad6;hp=0abb228817bfe4c6147bbce0027310050436976e;hb=49ebd11453f6d43c218809855c3947f83f7af2c0;hpb=ec650caf22cc7e4d7415aab931fe1923db3cf85d diff --git a/default.action.master b/default.action.master index 0abb2288..eefa9c49 100644 --- a/default.action.master +++ b/default.action.master @@ -11,23 +11,23 @@ # # File : $Source: /cvsroot/ijbswa/current/default.action.master,v $ # -# $Id: default.action.master,v 1.316 2014/12/19 12:31:10 fabiankeil Exp $ +# $Id: default.action.master,v 1.336 2017/04/09 09:11:46 fabiankeil Exp $ # # Requires : This version requires Privoxy v3.0.11 or later due to # syntax changes. # # Purpose : Default actions file, see -# http://www.privoxy.org/user-manual/actions-file.html. +# https://www.privoxy.org/user-manual/actions-file.html. # This file is subject to periodic updating. It is # not supposed to be edited by the user. Local exceptions # 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 -# Privoxy team. http://www.privoxy.org/ +# Copyright : Written by and Copyright (C) 2001-2017 the +# Privoxy team. https://www.privoxy.org/ # # Feedback welcome, for details please have a look at: -# http://www.privoxy.org/user-manual/contact.html +# https://www.privoxy.org/user-manual/contact.html # # The current development version of this file is located: # http://ijbswa.cvs.sourceforge.net/viewvc/ijbswa/current/default.action.master @@ -37,7 +37,7 @@ ############################################################################# # # A much better explanation can be found in the user manual which is -# part of the distribution and can be found at http://www.privoxy.org/user-manual +# part of the distribution and can be found at https://www.privoxy.org/user-manual # # To determine which actions apply to a request, the URL of the request is # compared to all patterns in this file. Every time it matches, the list of @@ -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: @@ -1142,6 +1147,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/ #---------------------------------------------------------------------------- @@ -1479,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) @@ -1917,6 +1935,18 @@ adn.speedtest.net .stopwatchingus.info/ # URL = http://www.amnesty.de/files/Banner_gelb_Manning_300x250.gif .amnesty.de/ +#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/ +#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/ +# URL = http://msdn.microsoft.com/en-us/library/system.diagnostics.stacktrace.framecount.aspx +msdn.microsoft.com/ ############################################################################# @@ -2102,6 +2132,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 @@ -2269,6 +2301,10 @@ javabog.dk/ijk/ creativecommons.org/ # URL = http://kggp.de/Blogosphere/blog/2014/11/07/frankfurtmain-hessen-polizeibeamter-muss-sich-vor-gericht-verantworten/ 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} @@ -2528,7 +2564,29 @@ TAG:^IMAGE-REQUEST$ ############################################################################# # Depends on +client-header-tagger{css-requests} ############################################################################# -{+handle-as-empty-document \ +{-deanimate-gifs \ + -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$ @@ -2560,4 +2618,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