More minor updates per Fabian's suggestions. Now have two distinct categories

[privoxy.git] / default.action.master

diff --git a/default.action.master b/default.action.master
index a22f606..00d6576 100644 (file)
--- a/default.action.master
+++ b/default.action.master
@@ -2,7 +2,7 @@
 # 
 #  File        :  $Source: /cvsroot/ijbswa/current/default.action.master,v $
 # 
-#  $Id: default.action.master,v 1.1.2.39 2004/10/03 14:03:33 david__schmidt Exp $
+#  $Id: default.action.master,v 1.12 2006/08/03 02:46:41 david__schmidt Exp $
 #
 #  Purpose     :  Default actions file, see
 #                 http://www.privoxy.org/user-manual/actions-file.html
@@ -201,7 +201,7 @@
 #    responses as well. Use this action for servers that use HTTP/1.1
 #    protocol features that Privoxy currently can't handle yet.
 #
-# +fast-redirects
+# +fast-redirects{check-decoded-url}
 #    Many sites, like yahoo.com, don't just link to other sites.
 #    Instead, they will link to some script on their own server,
 #    giving the destination as a parameter, which will then redirect
@@ -217,7 +217,7 @@
 #    time is wasted, while your browser aks the server for one redirect
 #    after the other. Plus, it feeds the advertisers.
 #
-#    The +fast-redirects option enables interception of these requests
+#    The +fast-redirects{check-decoded-url} option enables interception of these requests
 #    by Privoxy, who will cut off all but the last valid URL in the
 #    request and send a local redirect back to your browser without
 #    contacting the intermediate sites.
@@ -505,6 +505,8 @@ adsl.
 ad[udmw]*.
 adbl*.
 adam*.
+adob*.
+adtp*.
 adv[oia]*.
 .*road*.
 .olympiad*.
@@ -1170,6 +1172,7 @@ www.baycitybaptist.org/images/Banner.jpg
 .office.microsoft.com
 .windowsupdate.microsoft.com
 .apple.com
+.yahoo.com
 
 #----------------------------------------------------------------------------
 # Shopping and banking sites - allow cookies and pop-ups
@@ -1577,6 +1580,11 @@ www.geocities.com/js_source
 #MASTER# REMARKS: Can't catch by size or location
 www.dn.se
 
+{-filter{img-reorder}}
+#MASTER# PROBLEM-URL: http://images.google.com
+#MASTER# REMARKS: Google images don't show up with img-reorder on
+images.google.com
+
 {-filter{js-annoyances}}
 #MASTER# PROBLEM-URL: http://www.munichre.com/
 #MASTER# REMARKS: Endless reload loop if referrer info supressed
@@ -1606,7 +1614,7 @@ cf.nbc4.com/
 #MASTER# PROBLEM-URL: http://www.hh.schule.de/ak/nt/
 www.hh.schule.de/ak/nt/
 
-{+fast-redirects -block}
+{+fast-redirects{check-decoded-url} -block}
 #MASTER# PROBLEM-URL: http://isbn.nu/0596001088/price/2.html
 www.commission-junction.com/track/
 #MASTER# PROBLEM-URL: http://uk.rd.yahoo.com/M=200059723.200849546.202365062.200414073/D=ukhmpg/S=15426100:TEAR/A=200396897/R=1119/id=img1_nocap_dial/*http://ad.uk.doubleclick.net/clk;5982435;8261020;g?http://www.lunnpoly.com