Added exception for fish4.co.uk and moved shockwave.com exception to the correct...

diff --git a/default.action.master b/default.action.master
index 1a93645..de4477d 100644 (file)
--- a/default.action.master
+++ b/default.action.master
@@ -9,7 +9,7 @@
 # 
 #  File        :  $Source: /cvsroot/ijbswa/current/default.action.master,v $
 # 
-#  $Id: default.action.master,v 1.69 2007/03/26 17:37:39 proactivesvcs Exp $
+#  $Id: default.action.master,v 1.70 2007/04/02 08:49:49 proactivesvcs Exp $
 #
 #  Requires    :  This version requires Privoxy v3.0.7 or later due to 
 #                 syntax changes.
@@ -681,9 +681,6 @@ countr*.
 /.*(lo|thre|he|d|gr|l|ro|re|squ|class(ified)?)ads
 /.*account
 support./(.*/)?track
-#MASTER# REMARKS: 20070402 Adam Piggott first-party tracking
-#MASTER# PROBLEM URL: http://www.shockwave.com/servlet/DownloadEcommTracker?sku=fizzball-pc&promoCode=SiteShockwaveLandingPage
-.shockwave.com/servlet/DownloadEcommTracker
 
 #############################################################################
 # Exceptions for academia and non-profits
@@ -1360,6 +1357,12 @@ edge.macworld.com
 #MASTER# UNBLOCK-REFERRER: http://lads.myspace.com/videos/vplayer.swf
 #MASTER# REMARKS: MySpace videos caught by .*ads. The above profile.myspace.com link grabs the vplayer.swf file (which does not work when directly fetched)
 lads.myspace.com
+#MASTER# REMARKS: 20070402 Adam Piggott first-party tracking. 20070411 Moved from generic unblockers by path to site-specific unblockers.
+#MASTER# UNBLOCK-REFERRER: http://www.shockwave.com/servlet/DownloadEcommTracker?sku=fizzball-pc&promoCode=SiteShockwaveLandingPage
+.shockwave.com/servlet/DownloadEcommTracker
+#MASTER# UNBLOCK-REFERRER: http://www.fish4.co.uk/iad/lettings/advert?adId=12389712&src=nestoria
+#MASTER# REMARKS 20070411 Adam Piggott fish4.co.uk is a popular UK advertising site for cars, properties and jobs and uses ad/advert all over the place, understandably.
+.fish4.co.uk/.*ad
 
 #############################################################################
 # Site-specific special rules: