Adjust actionsfile directives to use complete file names.

[privoxy.git] / default.action.master

diff --git a/default.action.master b/default.action.master
index 0daafcd..b7dcfc7 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.68 2007/03/20 15:40:00 fabiankeil Exp $
+#  $Id: default.action.master,v 1.76 2007/05/17 15:37:00 fabiankeil Exp $
 #
 #  Requires    :  This version requires Privoxy v3.0.7 or later due to 
 #                 syntax changes.
@@ -815,6 +815,9 @@ ad.theadhost.com
 MASTER# BLOCK-REFERRER: via Yahoo groups
 MASTER# REMARKS: Actionsfile tracker 1645513 2007-01-26
 .adinterax.com/(?!(.*)\.(js|gif|jpg))
+MASTER# BLOCK-REFERRER:  http://www.weilpod.com
+MASTER# REMARKS: Actionsfile feedback item #1710951 2007-05-02
+img.bluehost.com
 
 #----------------------------------------------------------------------------
 # Misc Web-bugs, JS and just plain Junk. Images here aren't normal images.
@@ -1011,7 +1014,8 @@ jmcms.cydoor.com/
 #MASTER# BLOCK-REFERRER: http://discussion.brighthand.com/forumdisplay.php?s=fee44a5b2a6fc2e9e79d6472bc8fbe94&forumid=197 10/19/06
 *[0-9].tribalfusion.com/
 #MASTER# REMARKS: Actions file tracker 1547656 09/02/06
-img.mediaplex.com
+#MASTER# REMARKS: Update pattern: Actionsfile feedback item #1698822, was opened at 2007-04-11 to catch https://secure.img-cdn.mediaplex.com/0....
+img*.mediaplex.com
 #MASTER# BLOCK-REFERRER: http://www.tomshardware.com/ 09/28/06
 #MASTER# REMARKS: There is adfarm and altfarm.mediaplex
 a*farm.mediaplex.com
@@ -1187,15 +1191,6 @@ smartad.*.*.*
 #MASTER# BLOCK-REFERRER: http://www.powerdvd.com 12/28/06 per SF tracker
 /top\.php\?d=.*\.[a-z]{2,5}
 
-#############################################################################
-# Generic -overwrite-last-modified patterns for URLs that look
-# as if they belong to files that are often fetched through download
-# managers. Randomizing the Last-Modfied date causes problems with
-# interrupted downloads.
-#############################################################################
-{-overwrite-last-modified}
-/.*\.(tar|gz|b?zip2?|t[gb]z|iso|dmg|avi|m(p4|4v)|mpe?g)$
-
 #############################################################################
 # Site-specific unblockers:
 #############################################################################
@@ -1357,6 +1352,19 @@ 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
+#MASTER# REMARKS Actionsfile feedback item #1700037 2007-04-13 HB
+#MASTER# UNBLOCK-REFERRER: http://www.mp3.com.au/popup/popup.asp?id=110433
+.mp3.com.au/.*popup
+#MASTER# REMARKS Actionsfile feedback #1700915 2007-04-15
+#MASTER# UNBLOCK-REFERRER: http://www.svd.se/ego/339/http://www.e24.se/dynamiskt/reklam_media/did_15092793.asp
+#MASTER# UNBLOCK-REFERRER: http://www.e24.se/dynamiskt/reklam_media/did_15092793.asp
+/(.*/)?dynamiskt/reklam_media/did_
 
 #############################################################################
 # Site-specific special rules:
@@ -1498,6 +1506,10 @@ schneegans.de/
 config.privoxy.org/
 #MASTER# PROBLEM-URL: http://users.wsj.com/lmda/do/checkLogin?mg=evo-wsj&url=http%3A%2F%2Fonline.wsj.com%2Farticle%2FSB117313867582027623.html
 .wsj.com/lmda/do/checkLogin
+#MASTER# PROBLEM-URL: http://del.icio.us/url/check\?url=http%3A%2F%2Fwww.privoxy.org
+#MASTER# REMARKS: As we already have five other PROBLEM-URLs that contain '?url=',
+#MASTER# REMARKS: it might make sense to allow '/.*?url=' in general
+del.icio.us/
 
 #----------------------------------------------------------------------------
 # No filtering for sourcecode or other automatically parsed content
@@ -1848,6 +1860,13 @@ www.skweezer.net/bloglines
 {+redirect{http://config.privoxy.org/}}
 .privoxy.org/config
 
+#MASTER# REMARKS: Privoxy's "unsafe" CGI pages check the referrer 
+#MASTER# REMARKS: to make sure the user reached them intentionally.
+#MASTER# REMARKS: If the referrer is blocked, CGI editing is impossible.
+{-hide-referrer}
+p.p/
+config.privoxy.org/
+
 #MASTER# REMARKS: Yahoo logout URLs need special treatment,
 #MASTER# REMARKS: the URL after "done=" is no fast-redirect. 2007-01-19 fk
 #MASTER# REMARKS: Reported in support request #1635354.
@@ -1856,3 +1875,24 @@ www.skweezer.net/bloglines
 .yahoo./.*http://login.yahoo.com/config/login.*http://
 
 #MASTER# set vi:nowrap
+
+#----------------------------------------------------------------------------
+# Sections that modify the action settings based on tags.
+#----------------------------------------------------------------------------
+
+#############################################################################
+# Depends on +client-header-tagger{image-requests}
+#############################################################################
+{-handle-as-empty-document \
+ +handle-as-image \
+}
+TAG:^IMAGE-REQUEST$
+
+#############################################################################
+# Depends on +client-header-tagger{css-requests}
+#############################################################################
+{+handle-as-empty-document \
+ -handle-as-image \
+}
+TAG:^CSS-REQUEST$
+