X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=default.action.master;h=24d62e7adb5503a04091bf650881aeb68674cc3e;hp=2a71b2515b4bf5ef9e1eefd04065b9c2e2acecbd;hb=8875cc0bd68dd60dfc150adf6d147eec216789ec;hpb=f350f61e6c8bc105f4de6469fe4ef51bfe58635d

diff --git a/default.action.master b/default.action.master
index 2a71b251..24d62e7a 100644
--- a/default.action.master
+++ b/default.action.master
@@ -9,35 +9,33 @@
 #MASTER# COMMENT:
 ######################################################################
 #
-#  File        :  $Source: /cvsroot/ijbswa/current/default.action.master,v $
-#
-#  $Id: default.action.master,v 1.299 2013/10/30 14:31:05 fabiankeil Exp $
+#  File        :  default.action.master
 #
 #  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-2019 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/*checkout*/ijbswa/current/default.action.master
+# http://ijbswa.cvs.sourceforge.net/viewvc/ijbswa/current/default.action.master
 #
 #############################################################################
 # Syntax
 #############################################################################
 #
 # 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
@@ -392,6 +390,17 @@
 #    +limit-connect{-}                     # All ports are OK
 #    +limit-connect{,}                     # No HTTPS/SSL traffic is allowed
 #
+# +limit-cookie-lifetime{lifetime in minutes}
+#
+#    This action reduces the lifetime of HTTP cookies coming from the
+#    server to the specified number of minutes, starting from the time
+#    the cookie passes Privoxy.
+#
+#    Cookies with a lifetime below the limit are not modified.
+#    The lifetime of session cookies is set to the specified limit.
+#    The effect of this action depends on the server.
+#     If the parameter is "0", this action behaves like session-cookies-only.
+#
 # +overwrite-last-modified{block}
 # +overwrite-last-modified{reset-to-request-time}
 # +overwrite-last-modified{randomize}
@@ -539,6 +548,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} \
 }
@@ -552,6 +562,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} \
@@ -581,6 +592,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 \
@@ -675,14 +687,26 @@ countr*.
 metrics.torproject.org/
 # URL = http://linuxcounter.net/
 linuxcounter.net/
+# URL = http://adinablafasel.example.org/
+adina*.
+# URL = http://adelelimedesign.deviantart.com/
+adele*.
+# URL = http://adlibris.com/
+adlibris.
+# URL = http://www.adbshell.com/
+.adbshell.com
+# URL = http://adbinstaller.com/
+.adbinstaller.com/
+# URL = https://adainitiativedotorg.files.wordpress.com/2012/07/founders_laughing.png
+ada*.
 
 #############################################################################
 # Generic block patterns by path:
 #############################################################################
 {+block{Path matches generic block pattern.}}
-/(.*/)?ad(\?|/|s|v|_?(image|se?rv|box)|cycle|rotate|mentor|click|f[ra]m|script|stream|fetch|log|space)
 # Blocked URL = http://www.example.org/adimage
 # Blocked URL = http://www.example.org/adspace
+/(.*/)?ad(\?|/|s|v|_?(image|se?rv|box)|cycle|rotate|mentor|click|f[ra]m|script|stream|fetch|log|space)
 /phpads(new)?/
 /(.*/)?(ad|all|nn|db|promo(tion)?)?[-_]?banner
 /(.*/)?(publicite|werbung|rekla(me|am)|annonse|maino(kset|nta|s)?/)
@@ -695,6 +719,10 @@ linuxcounter.net/
 /openx/www/delivery/
 # Blocked URL = http://mem.brandreachsys.com/www/delivery/lg.php?bannerid=13783&campaignid=0&zoneid=550&cb=f22df9acaa
 /.*bannerid=
+# MASTER# BLOCK-REFERRER: http://www.augsburger-allgemeine.de/donauwoerth/Grosseinsatz-Polizist-schiesst-um-sich-Er-hat-mehrere-Waffen-id30561822.html
+# Blocked URL = http://bilder.augsburger-allgemeine.de/img/incoming/orig30444932/2560007661/DigiAd-Zeopexx-03072014.gif
+# Blocked URL = http://bilder.augsburger-allgemeine.de/img/incoming/orig30463337/9180008457/DigiAd-AugenblickOptik-04072014.gif
+/.*DigiAd
 
 #############################################################################
 # Generic unblockers by path:
@@ -880,6 +908,9 @@ pool.*.adhese.com/
 #MASTER# BLOCK-REFERRER: http://www.tradera.com/
 # Blocked URL = http://oskar.tradera.com/script.js
 oskar.tradera.com/
+#MASTER# BLOCK-REFERRER: http://www12.zippyshare.com/v/64444425/file.html
+# Blocked URL = http://www.adcash.com/script/java.php?option=rotateur&rotateur=146355
+.adcash.com/script/
 
 {+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
@@ -1120,6 +1151,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/
 
 
 #----------------------------------------------------------------------------
@@ -1395,8 +1439,6 @@ www.xml.eshop.msn.com/tracksponsorimpression.asp
 content.ipro.com
 #MASTER# BLOCK-REFERRER: http://www.weatherbug.com/default.asp 10/05/06
 .247realmedia.com
-#MASTER# BLOCK-REFERRER: http://www.samachar.com/ 10/05/06
-.sify.com
 #MASTER# BLOCK-REFERRER: http://www.nbc4.com/news/2672416/detail.html 10/06/06
 .searchignite.com
 #MASTER# BLOCK-REFERRER: http://www.sdtimes.com/ 10/07/06
@@ -1459,7 +1501,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)
@@ -1890,6 +1932,29 @@ adn.speedtest.net
 .serverfault.com/(.*/)?popup
 # URL = http://cs.superuser.com/posts/popup/close/suggest-originals/16678?_=1383517814677
 .superuser.com/(.*/)?popup
+#MASTER# UNBLOCK-REFERRER: http://cologne.stopwatchingus.info/demo-12-april.html
+# URL = http://cologne.stopwatchingus.info/images/banner/Demo-Koeln-12-04-14-Banner.png
+# URL = http://cologne.stopwatchingus.info/images/banner/Demo-Koeln-12-04-14-Banner2.png
+# URL = http://cologne.stopwatchingus.info/images/banner/Demo-12-April.jpg
+.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/
+# URL = http://talks.golang.org/2013/advconc/gopherswrench.jpg
+.golang.org/
+# URL = http://adaway.org/
+adaway.org/
 
 
 #############################################################################
@@ -2069,6 +2134,16 @@ webcache.googleusercontent.com/
 .facebook.com/plugins/like.php
 # URL = http://creativecommons.org/choose/zero/confirm?license-class=zero&name=...&actor_href=http%3A%2F%2Fexample.org%2F&work_title=...&work_jurisdiction=DE&confirm=confirm&understand=confirm&lang=de&field1=weiter
 creativecommons.org/
+# URL = http://ixquick-proxy.com/do/spg/proxy?ah=&c=hnf&rid=LHLOLMSTPRKK&proxiedformtype=&q=%22lord+lucan%22&sp=19f738b4691d795804a6bc60c5b2c766&ts=MTQxMjg5NTcxNw%3D%3D&u=https%3A%2F%2Fen.wikipedia.org%2Fwiki%2FJohn_Bingham%2C_7th_Earl_of_Lucan&rpos=1&l=english_uk&cat=web&zst=1412895717.21&znt=1412895717.2125&rl=NONE&hlq=https%3A%2F%2Fstartpage.com%2Fdo%2Fsearch&mtppabp=1&mtppcat=web&mtppcmd=process_search&mtppenginecount=1&mtppflag_ac=0&mtpplanguage=english_uk&udata=e9a958f0a1bae930ec8f60fdef42ceb3&/file.gz
+ixquick-proxy.com/
+# URL = http://yandex.ru/showcaptcha?cc=1&retpath=http%3A//yandex.ru/yandsearch%3Ftext%3Dgeli%2Bfreebsd%26lr%3D87%26p%3D3_...e690efd1ab5a14671c2362ea59
+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/
+# URL = http://www.youtube.com/embed/blafasel?feature=oembed&enablejsapi=1&origin=http://www.example.com&wmode=opaque
+.youtube.com/.*origin=http
 
 {+redirect{s@.*url=@http://@} -block}
 # Sticky Actions = +redirect -block
@@ -2234,6 +2309,12 @@ javabog.dk/ijk/
 .dgb-tagungszentren.de/
 # URL = http://creativecommons.org/licenses/
 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}
@@ -2453,6 +2534,13 @@ config.privoxy.org/
 # Redirect Destination = http://login.yahoo.com/config/login?logout=1&.done=http://mail.yahoo.com&.src=ym&.intl=us
 .yahoo./.*http://login.yahoo.com/config/login.*http://
 
+#MASTER# PROBLEM-URL: http://www.washingtonpost.com/news/volokh-conspiracy/wp/2014/07/09/missouri-voters-will-consider-strengthening-state-constitutional-right-to-bear-arms/
+{-fast-redirects +redirect{s@.*(http://[^&]+\.jpg).*$@$1@i}}
+# Sticky Actions = -fast-redirects +redirect
+# Redirected URL = http://www.washingtonpost.com/wp-apps/imrs.php?src=http://img.washingtonpost.com/news/volokh-conspiracy/wp-content/uploads/sites/14/2014/07/Volk1.jpg&w=480
+# Redirect Destination = http://img.washingtonpost.com/news/volokh-conspiracy/wp-content/uploads/sites/14/2014/07/Volk1.jpg
+.washingtonpost.com/wp-apps/imrs\.php\?src=
+
 #MASTER# REMARKS: The next two sections are to get flickr's Ajax interface working
 #MASTER# REMARKS: with default pre-settings. For more aggressive defaults they additionally
 #MASTER# REMARKS: need -crunch-incoming-cookies and -crunch-outgoing-cookies.
@@ -2486,9 +2574,67 @@ 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$
 
+#############################################################################
+# Depends on +client-header-tagger{content-type}
+#############################################################################
+{-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} \
+}
+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