don't need the extra time() call

[privoxy.git] / default.action.master

diff --git a/default.action.master b/default.action.master
index 4a87efa..21a5843 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.173 2009/04/16 00:03:24 hal9 Exp $
+#  $Id: default.action.master,v 1.181 2009/06/28 12:41:29 fabiankeil Exp $
 #
 #  Requires    :  This version requires Privoxy v3.0.11 or later due to
 #                 syntax changes.
@@ -748,6 +748,10 @@ support./(.*/)?track
 landing.trafficz.com/
 # Blocked URL = http://www.searchnut.com/?domain=www.inetcat.org
 .searchnut.com/\?domain
+#MASTER# REMARKS: Verizon should know better
+#MASTER# BLOCK-REFERRER: http://www.qwetyhjkl.com
+# Blocked URL = http://wwwz.websearch.verizon.net/search?qo=www.qwetyhjkl.com
+wwwz.websearch.verizon.net/search\?qo=
 
 {+block{Site-specific block pattern matches.}}
 #MASTER# BLOCK-REFERRER: http://www.brooksbrothers.com/ 10/18/06
@@ -896,6 +900,10 @@ static.lycos-europe.net
 #MASTER# BLOCK-REFERRER: http://www.news.software.coop/paralysed-perl-package-problem/602/
 # Blocked URL = http://www.awin1.com/cread.php?s=123049&v=1983&q=80970&r=79561
 .awin1.com
+#MASTER# BLOCK-REFERRER: http://crooksandliars.com/
+# Blocked URL = http://rotator.adjuggler.com/servlet/ajrotator/616245/0/vh?z=csm&dim=616028
+.adjuggler.com/servlet/ajrotator/
+
 
 #----------------------------------------------------------------------------
 # Misc Web-bugs, JS and just plain Junk. Images here aren't normal images.
@@ -1024,6 +1032,9 @@ bwp.
 .yahoo.com/mc/stampNonJs
 # Blocked URL = http://richmedia.yimg.com/js/123/personnals_banners/PER_happy_sara1_4_425x600/ad.js?q=123
 /.*/ad\.js\?
+# Blocked URL = http://i.cmpnet.com/shared/omniture/s_code_remote.js
+#MASTER# BLOCK-REFERRER: http://www.informationweek.de/
+/.*omniture.*\.js
 
 
 #############################################################################
@@ -1120,7 +1131,7 @@ a.tribalfusion.com/
 #MASTER# REMARKS: Pointdexter
 .ru4.com/
 #MASTER# BLOCK-REFERRER: http://www.boursorama.com/infos/actualites/detail_actu_marches.phtml?news=1510287
-www.smartadserver.com/
+.smartadserver.com/
 #MASTER# BLOCK-REFERRER: http://www.chez.tiscali.fr/ 10/07/06
 admedia.
 #MASTER# REMARKS: Bannerfarm used by Morpheus file sharing software
@@ -1629,6 +1640,13 @@ qa.debian.org/popcon\.php
 #MASTER# UNBLOCK-REFERRER: http://www.cnn.com/video/#/video/showbiz/2009/04/14/dcl.boyle.british.talent.show.cnn
 # URL = http://i.cdn.turner.com/cnn/.element/js/2.0/video/xmp/AdServiceAdapter.swf
 .turner.com/cnn/.*/AdServiceAdapter.swf
+#MASTER# REMARKS: Tracker 2786745 : MySpace music player doesn't work
+#MASTER# UNBLOCK-REFERRER: www.myspace.com/bandofskulls
+# URL = http://lads.myspacecdn.com/videos/musicPlayerAssets.swf
+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/
 
 
 #############################################################################
@@ -1803,6 +1821,8 @@ view.samurajdata.se/ps\.php\?url=
 .landsend.de/
 # URL = http://www.youtube.com/swf/l.swf?swf=http%3A//s.ytimg.com/yt/swf/cps-vfl68942.swf&video_id=2cpd6rHIfyA&rel=1&showsearch=1&eurl=&iurl=http%3A//i3.ytimg.com/vi/2cpd6rHIfyA/hqdefault.jpg&sk=5E3I2RCcOLknk1qyI_JgVVnb8FKwgpHzC&use_get_video_info=1&load_modules=1&fs=1&hl=en
 .youtube.com/swf/.*swf=
+# URL = http://redbot.org/?uri=http%3A//apache.org/
+.redbot.org/
 
 #----------------------------------------------------------------------------
 # No filtering for sourcecode or other automatically parsed content
@@ -1961,9 +1981,6 @@ javabog.dk/ijk/
 #MASTER# REMARKS: This section NOT checked 10/18/06 HB
 #MASTER# REMARKS: These are movie clips, linked from http://us.imdb.com
 .totaleclips.com
-#MASTER# REMARKS: Link to download page breaks
-# URL = http://www.mandrakelinux.com/en/ftp.php3
-.mandrakelinux.com/en/ftp.php3
 #MASTER# REMARKS: Actions Tracker 1313157
 # URL = http://validator.w3.org/check?uri=referer
 validator.w3.org/check\?uri=referer
@@ -2091,7 +2108,7 @@ rds.yahoo.com/
 #MASTER# COMMENTS: Verified 2007-01-19 fk
 #MASTER# REDIRECT-REFERRER: http://www.gamefaqs.com/computer/doswin/game/914819.html
 # URL = http://dw.com.com/redir?asid=0&astid=8&siteid=19&edid=107&destCat=33862&destURL=http%3A%2F%2Fdb.gamefaqs.com%2Fcomputer%2Fdoswin%2Ffile%2Fvampire_tmb_b.txt
-dw.com.com/
+dw.com.com/redir\?
 #MASTER# REMARKS: Action tracker 1593393. Added 2007-01-20.
 # URL = http://wzus.bloglines.com/r?t=a&d=us&s=bl&c=blen&ti=1&ai=51060&l=dir&o=0&sv=z6f537f5b&ip=971AC44B&u=http%3A%2F%2Fwww.skweezer.net%2Fbloglines%2Fskweeze.aspx%3F%26i%3Dd%26l%3Den%26r%3Dhttp%253A%252F%252Fwww.bloglines.com%252Fmyblogs_display%253Fsub%253D29302699%2526site%253D5382440%26url%3Dhttp%253A%252F%252Fpermalink.gmane.org%252Fgmane.linux.debian.devel.changes.unstable%252F97340
 .bloglines.com/r\?