X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=default.action.master;h=15eed2f5bf563289e0b771c2d507b4410f17837b;hb=d1a32a688bb2d2e1020cd3e612c4629b5325f288;hp=163139ca4d25f1bddb54d0e92f9ef41ac46582d6;hpb=72e8b59883434f93851db0a5a67e55363e3dfd02;p=privoxy.git

diff --git a/default.action.master b/default.action.master
index 163139ca..15eed2f5 100644
--- 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.136 2008/08/03 18:25:43 fabiankeil Exp $
+#  $Id: default.action.master,v 1.143 2008/08/11 00:39:42 hal9 Exp $
 #
 #  Requires    :  This version requires Privoxy v3.0.9 or later due to 
 #                 syntax changes.
@@ -576,7 +576,6 @@ allow-ads   = -block -filter{banners-by-size} -filter{banners-by-link}
 # Generic block patterns by host:
 #############################################################################
 {+block{Host matches generic block pattern.}}
-#MASTER# DONT-VERIFY (generic)
 ad*.
 .*ads.
 #MASTER# REMARKS: removed .ad. 2007-12-18 HB
@@ -600,7 +599,6 @@ metrics.
 # Generic unblockers by host:
 #############################################################################
 {-block}
-#MASTER# DONT-VERIFY (generic)
 adsl.
 ad[udmw]*.
 adbl*.
@@ -610,7 +608,6 @@ adob*.
 adrenaline.
 adtp*.
 adv[oia]*.
-#MASTER# REMARKS: Added 2008-02-08 HB
 adventure*.
 .*road*.
 .olympiad*.
@@ -623,16 +620,14 @@ countr*.
 # Generic block patterns by path:
 #############################################################################
 {+block{Path matches generic block pattern.}}
-#MASTER# DONT-VERIFY (generic)
 /(.*/)?ad(\?|/|s|v|_?(image|se?rv|box)|cycle|rotate|mentor|click|f[ra]m|script|stream|fetch|log|space)
 # Blocked URL = http://www.example.org/adimage
 # Blocked URL = http://www.example.org/adspace
 /phpads(new)?/
 /(.*/)?(ad|all|nn|db|promo(tion)?)?[-_]?banner
-/(.*/)?(publicite|werbung|reklaa?m|annonse|maino(kset|nta|s)?/)
+/(.*/)?(publicite|werbung|rekla(me|am)|annonse|maino(kset|nta|s)?/)
 /.*(count|track|compteur|(?<!relo)adframe|adse?rve?|banner)(er|run)?(\?|\.(pl|cgi|exe|dll|asp|php|cpt))
 /(.*/)?clicktrack
-#MASTER# REMARKS: Added 12/28/06 per Adam Piggott
 /(.*/)?(full)?pop[-_]?(up|over|under|open(er)?)?s?(/|\.)
 /(.*/)?((flash)?pop|live(cnt|count(er)?)).*\.(js|php|cgi)
 
@@ -641,7 +636,6 @@ countr*.
 #############################################################################
 {-block}
 # Sticky Actions = -block
-#MASTER# DONT-VERIFY (generic)
 /.*ad(sl|v(i[cs]|o|an|ertencia|ent|.*search|erse)) # advice/advisories/advan*/advertencia (spanish) adverse
 /.*(lo|thre|he|d|gr|l|ro|re|squ|class(ified)?)ads
 /.*account
@@ -655,7 +649,6 @@ support./(.*/)?track
 .uni-*.de
 .tu-*.de
 .gov
-#MASTER# REMARKS: 09/18/06 Tracker request
 .hs-*.de 
 .fh-*.de
 #MASTER# REMARKS: Try to avoid harmless names in non-commercial organizations. Added 10/24/06
@@ -1003,10 +996,8 @@ bwp.
 #.yimg.com/a/.*/flash/
 #MASTER# REMARKS: The above replaced with below. Actions file tracker #1645616 2007-01-27
 .yimg.com/.*\.yimg\.com/a/
-#MASTER# DONT-VERIFY
 bs*.gsanet.com
 bs*.einets.com
-#MASTER# DONT-VERIFY 
 .qkimg.net
 #MASTER# BLOCK-REFERRER: http://salon.com/ 10/19/06
 #MASTER# BLOCK-REFERRER: http://maps.yahoo.com/
@@ -1043,7 +1034,6 @@ a.tribalfusion.com/
 www.smartadserver.com/
 #MASTER# BLOCK-REFERRER: http://www.chez.tiscali.fr/ 10/07/06
 admedia.
-#MASTER# DONT-VERIFY
 #MASTER# REMARKS: Bannerfarm used by Morpheus file sharing software
 jmcms.cydoor.com/
 #MASTER# BLOCK-REFERRER: http://www.tech-report.com/etc/2003q2/3dmurk03/index.x?pg=7
@@ -1204,6 +1194,9 @@ feeds.feedburner.com/~r/.*/~4/
 # Blocked URL = http://feeds.feedburner.com/~a/DilbertDailyStrip?a=Ebzxel
 #MASTER# REMAKRKS: This looks like a pattern as well, maybe we should block feeds.feedburner.com/~a/ here.
 feeds.feedburner.com/~a/DilbertDailyStrip\?
+#MASTER# BLOCK-REFERER: http://www.buch.de/
+# URL = http://track.webtrekk.de/471497967328727/wt.pl?p=177,de.buch.show.home,1,1024x768,24,1,1218816426275,0,884x653,0&enc1=%FC&enc2=iso-8859-1&st=view&la=en-US&np=Default%20Plugi
+track.webtrekk.de/
 
 #----------------------------------------------------------------------------
 # Specific counters (see above for generic patterns)
@@ -1224,7 +1217,6 @@ bilbo.counted.com/
 #MASTER# BLOCK-REFERRER: http://www.travelocity.com/Vacations/0,,TRAVELOCITY||Y,00.html?HPTRACK=mpc_vac
 #MASTER# BLOCK-REFERRER: http://dest.travelocity.com/DestGuides/geo_frontdoor/0,,TRAVELOCITY,00.html?HPTRACK=icon_dest 10/07/06
 .travelocity./Sponsor_gifs/
-#MASTER# DONT-VERIFY
 #MASTER# REMARKS: Referenced from HTML-Emails (not checked 10/08/06)
 # URL = http://foo.weather.com/creatives/
 # URL = http://bar.weather.com/web/services/email/
@@ -1476,7 +1468,7 @@ www.google.com/adsense/
 .encyclopediadramatica.com/
 #MASTER# UNBLOCK-REFERRER: http://lifehacker.com 2008-04-18 HB
 # URL = tags.gawker.com/assets/minify.php?files=/assets/base.v6/css/global.css,/assets/base.v6/css/header.css,/assets/base.v6/css/sidebar.css,/assets/base.v6/css/content.css,/assets/base.v6/css/images.css,/assets/base.v6/css/ads.css,/assets/base.v6/css/community.css,/assets/base.v6/css/comments.css,/assets/base.v6/css/messages.css,/assets/base.v6/css/ui.css
-tags.gawker.com/.*css
+tags.gawker.com/.*css$
 # URL = http://cgi.tnt.co.uk/TrackNTrace/quicktrack.asp
 .tnt.co.uk/TrackNTrace/
 #MASTER# UNBLOCK-REFERRER: http://www.supermediastore.com/trackorder.html
@@ -1491,7 +1483,13 @@ ad.doubleclick.net/crossdomain\.xml
 #MASTER# UNBLOCK-REFERRER: http://real.custhelp.com/cgi-bin/real.cfg/php/enduser/std_adp.php?p_faqid=4512
 # URL = http://real.custhelp.com/cgi-bin/real.cfg/php/enduser/popup_adp.php
 real.custhelp.com/cgi-bin/real\.cfg/php/enduser/popup_adp\.php
-
+# URL = http://fritz.fonwlan.box/cgi-bin/webcm?getpage=../html/de/help/popup.html&var:lang=de&var:pagename=hilfe_syslog&var:anker=24
+fritz.fonwlan.box/
+# URL = http://fritz.box/cgi-bin/webcm?getpage=../html/de/help/popup.html&var:lang=de&var:pagename=hilfe_syslog&var:anker=24
+fritz.box/
+#MASTER# REMARKS: Actionsfile feedback item #2043327 2008-08-08
+# URL = http://kb.adobe.com/selfservice/viewContent.do?externalId=kb402747&sliceId=1
+.adobe.com
 
 #############################################################################
 # Site-specific special rules:
@@ -1682,7 +1680,6 @@ liveupdate.symantecliveupdate.com
 .bookmarklets.com
 # URL = http://www.squarefree.com/bookmarklets/
 .squarefree.com/bookmarklets/
-#MASTER# DONT-VERIFY
 #MASTER# REMARKS: Used by Mac OSX's automatic software update feature
 swquery.apple.com
 swscan.apple.com
@@ -1845,6 +1842,8 @@ schneegans.de/sv/\?url=referer
 .teamquest.com/gifs/gunther/
 #MASTER# REMARKS: 09/12/06 Art site, and ad-free
 .rubberslug.com
+#MASTER# REMARKS: Actionsfile feedback item #2040467, allow animated gifs from wikipedia.org
+.wikipedia.org/
 
 #----------------------------------------------------------------------------
 # The "site-specifics" filter has special cures for problems found here:
@@ -1921,7 +1920,6 @@ blogs.msdn.com
 
 {-filter{unsolicited-popups}}
 # Sticky Actions = -filter{unsolicited-popups}
-#MASTER# DONT-VERIFY
 #MASTER# REMARKS: Breaks Movable Type's admin interface (http://www.movabletype.org/)
 /.*mt.cgi$
 #MASTER# REMARKS: Exclude per Debian bug report #377843 09/17/06