X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=default.action.master;h=e16e666cb48078ee453782bbf0f112bac20b0957;hb=4d720328bdfcf01f35b5c4f60dc981e92e16fe78;hp=1219e8e215a041612dc3853bc4ccf1a91d4af68c;hpb=14ab083ec2a83503d6ce4c8cf8ed8b6024990b71;p=privoxy.git

diff --git a/default.action.master b/default.action.master
index 1219e8e2..e16e666c 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.183 2009/07/11 11:13:26 fabiankeil Exp $
+#  $Id: default.action.master,v 1.185 2009/08/15 16:12:16 fabiankeil Exp $
 #
 #  Requires    :  This version requires Privoxy v3.0.11 or later due to
 #                 syntax changes.
@@ -1659,6 +1659,8 @@ lads.myspacecdn.com/
 #MASTER# REMARKS: AF#2789653 iTunes download blocked
 # URL = http://a957.phobos.apple.com/us/r1000/000/Music/ad/47/56/mzi.gnjsyarh.aac.a.m4p
 .phobos.apple.com/
+# URL = http://eas8.emediate.eu/eas?camp=114;ty=ct;EASLink=http://www.jp.dk
+.emediate.eu/.*EASLink=
 
 
 #############################################################################
@@ -1680,7 +1682,7 @@ images.apple.com
 #MASTER# REMARKS: Actions Tracker 1293057 09/02/06
 .update.microsoft.com
 #MASTER# REMARKS: Various reports 09/16/06. This site also requires pop-ups.
-mail.google.
+mail.google.*
 
 #----------------------------------------------------------------------------
 # Semi-fragile, allow for blocks.
@@ -1703,7 +1705,7 @@ mail.google.
 .dabs.com
 .overclockers.co.uk
 .db24.de
-.ebay.
+.ebay.*
 .mobile.de
 www.fondationlejeu.com
 www.techtv.com
@@ -1752,7 +1754,8 @@ i.cnn.net/cnn/.*/clickability/button
 # Sticky Actions = -fast-redirects
 www.ukc.ac.uk/cgi-bin/wac\.cgi\?
 #MASTER# PROBLEM-URL: http://www.google.com/search?q=foo
-.google.
+# URL = http://www.google.com/search?q=foo
+.google.*
 #MASTER# PROBLEM-URL: http://de.altavista.com/q?pg=q&q=foo&kl=XX&search.x=28&search.y=8&what=web
 .altavista.com/(.*(like|url|link):|trans.*urltext=)http
 #MASTER# PROBLEM-URL: http://www.speedfind.de/cgi-bin/search?q=foo&t=STANDARD
@@ -1836,6 +1839,13 @@ view.samurajdata.se/ps\.php\?url=
 # URL = http://redbot.org/?uri=http%3A//apache.org/
 .redbot.org/
 
+{+redirect{s@.*url=@http://@} -block}
+# Sticky Actions = +redirect -block
+# URL = http://go.eniro.dk/lg/ni/http:/eas8.emediate.eu/eas?camp=79;ty=ct;EASLink=http://www.bt.dk?http://redirect.metropol.dk/cgi-bin/redir.pl?url=www.bt.dk
+# URL = http://eas8.emediate.eu/eas?camp=79;ty=ct;EASLink=http://www.bt.dk?http://redirect.metropol.dk/cgi-bin/redir.pl?url=www.bt.dk
+go.eniro.dk/.*EASLink=http://.*url=(?!<=http:)
+.emediate.eu/.*EASLink=http://.*url=(?!<=http:)
+
 #----------------------------------------------------------------------------
 # No filtering for sourcecode or other automatically parsed content
 #----------------------------------------------------------------------------