Move a pattern below its tests

[privoxy.git] / default.action.master

diff --git a/default.action.master b/default.action.master
index f55b069..dc19f43 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.304 2014/05/26 10:47:04 fabiankeil Exp $
+#  $Id: default.action.master,v 1.306 2014/07/14 12:57:00 fabiankeil Exp $
 #
 #  Requires    :  This version requires Privoxy v3.0.11 or later due to
 #                 syntax changes.
@@ -680,9 +680,9 @@ linuxcounter.net/
 # 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)?/)
@@ -2461,6 +2461,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.