X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=default.action.master;h=3c530f4ecd2ce1be09b9a264ca3e2eb2bcb427ff;hb=c26bc91d76e11f9d6d1457b43b82404029f9a054;hp=5602c68d7fff8d7c7fa8c3116f906de7b49501ae;hpb=eec7bac95743d1a15ee2a4806f8489ad29a4f878;p=privoxy.git

diff --git a/default.action.master b/default.action.master
index 5602c68d..3c530f4e 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.303 2014/05/05 09:55:25 fabiankeil Exp $
+#  $Id: default.action.master,v 1.311 2014/08/22 09:45:29 fabiankeil Exp $
 #
 #  Requires    :  This version requires Privoxy v3.0.11 or later due to
 #                 syntax changes.
@@ -30,7 +30,7 @@
 # http://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
@@ -675,14 +675,18 @@ countr*.
 metrics.torproject.org/
 # URL = http://linuxcounter.net/
 linuxcounter.net/
+# URL = http://adinablafasel.example.org/
+adina*.
+# URL = http://adelelimedesign.deviantart.com/
+adele*.
 
 #############################################################################
 # 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 +699,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:
@@ -2077,6 +2085,8 @@ 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/
 
 {+redirect{s@.*url=@http://@} -block}
 # Sticky Actions = +redirect -block
@@ -2461,6 +2471,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.
@@ -2524,6 +2541,6 @@ TAG:^CSS-REQUEST$
  -filter{msn} \
  -filter{blogspot} \
 }
-TAG:^(application|text)/javascript$
+TAG:^(application|text)/(x-)?javascript$
 
 #MASTER# set vi:nowrap