projects / privoxy.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Updating
[privoxy.git] / default.action.master
diff --git a/default.action.master b/default.action.master
index fce4982..a7dacaa 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.20 2003/04/02 15:11:40 oes Exp $
+#  $Id: default.action.master,v 1.1.2.31 2003/07/26 11:45:14 hal9 Exp $
 #
 #  Purpose     :  Default actions file, see
 #                 http://www.privoxy.org/user-manual/actions-file.html
@@ -69,7 +69,7 @@
 # can be left out:
 # 
 # www.example.com 
-#   is a domain-only pattern and will match any request to www.yahoo.com
+#   is a domain-only pattern and will match any request to www.example.com
 # 
 # www.example.com/
 #   means exactly the same (but is slightly less efficient)
@@ -462,7 +462,7 @@ allow-ads   = -block -filter{banners-by-size} -filter{banners-by-link}
 #############################################################################
 # Needed for automatic feedback evaluation; Please don't change or delete!
 #############################################################################
-{+add-header{X-Actions-File-Version: 1.6} -filter -kill-popups}
+{+add-header{X-Actions-File-Version: 1.7} -filter -kill-popups}
 .privoxy.org
 .oesterhelt.org/actions
 
@@ -491,6 +491,7 @@ ad*.
 .*ads.
 *banner*.
 count*.
+*counter.
 
 # By path:
 #
@@ -500,9 +501,35 @@ count*.
 /.*promo.gif
 
 #############################################################################
-# Site-specific block patterns;
+# Generic unblockers to narrow the side effects of the generic blockers:
 #############################################################################
+{-block}
+#MASTER# DONT-VERIFY (generic)
 
+# By host:
+#
+adsl.
+ad[udmw]*.
+adv[ia].
+.*road*.
+.olympiad*.
+.*load*.
+.*head*.
+.*squad*.
+.edu
+.ac.uk
+.uni-*.de
+
+# By path:
+#
+/.*ad(sl|v(i[cs]|ocacy|an|ertencia|ent|search)) # advice/advisories/advan*/advertencia (spanish)
+/.*((up|down)lo|p?thre|he|d|gr|l|ro|bre|spre|squ)ads
+/.*account
+
+#############################################################################
+# Site-specific block patterns;
+#############################################################################
+{+block}
 #MASTER# BLOCK-REFERRER: http://www.brooksbrothers.com/
 #MASTER# BLOCK-REFERRER: http://www.autodesk.com/
 .hitbox.com 
@@ -600,7 +627,6 @@ www.crazypopups.com
 #MASTER# DONT-VERIFY: Opera's list of banners to load (XML)
 /scripts/cms/xcms.asp
 
-
 #############################################################################
 # Generic block-as-image patterns:
 #############################################################################
@@ -695,6 +721,18 @@ imp*.tradedoubler.com
 www.spanishbanner.com/cgi/bserve.cgi
 #MASTER# BLOCK-REFERRER: http://www.macgamer.com/
 .qksrv.net
+#MASTER# BLOCK-REFERRER: http://www.drudgereport.com/
+.instacontent.net/fastclick/
+
+#----------------------------------------------------------------------------
+# Specific counters (see above for generic patterns)
+#----------------------------------------------------------------------------
+#MASTER# BLOCK-REFERRER: http://www.distrowatch.com/table.php?distribution=linex
+s*.sitemeter.com/meter\.asp
+#MASTER# BLOCK-REFERRER: http://personales.mundivia.es/lbouza/
+fastcounter.bcentral.com/
+#MASTER# BLOCK-REFERRER: http://osnews.com/
+bilbo.counted.com/
 
 #----------------------------------------------------------------------------
 # On-site ads and other single sources:
@@ -757,36 +795,14 @@ img.thebugs.ws
 www.kinghost.com/ban/
 #MASTER# BLOCK-REFERRER: http://www.infoempleo.com/
 www.infoempleo.com/(pop-up|images(/Nueva/banner_|/motor))
+#MASTER# BLOCK-REFERRER: http://www.hardocp.com/
+hera.hardocp.com/
 
 #############################################################################
-# Generic unblockers to narrow the side effects of the generic blockers:
+# Site-specific unblockers:
 #############################################################################
 {-block}
-#MASTER# DONT-VERIFY (generic)
-
-# By host:
-#
-adsl.
-ad[udm]*.
-advice.
-advan*.
-.*road*.
-.olympiad*.
-.*load*.
-.*head*.
-.edu
-.ac.uk
-.uni-*.de
 
-# By path:
-#
-/.*ad(sl|v(i[cs]|an|ertencia|ent|search)) # advice/advisories/advan*/advertencia (spanish)
-/.*((up|down)lo|p?thre|he|d|gr|l|ro|bre|spre)ads
-/.*account
-
-#############################################################################
-# Site-specific unblockers:
-#############################################################################
 #MASTER# UNBLOCK-REFERRER: http://www.faqs.org/
 www.faqs.org/banner\.html
 #MASTER# UNBLOCK-REFERRER: http://bannerblind.mozdev.org/
@@ -862,7 +878,14 @@ www.motel6.com/maps/detailmap_tracker.asp
 adzapper.
 #MASTER# UNBLOCK-REFERRER: http://de.altavista.com/web/adv
 .altavista.com/web/adv
-
+#MASTER# UNBLOCK-REFERRER: http://rads.mcafee.com/rads/scripts/RADS.dll?QueryProduct2
+rads.mcafee.com/rads/
+#MASTER# UNBLOCK-REFERRER: http://linuxfromscratch.org/cgi-bin/lfscounter.cgi
+linuxfromscratch.org/cgi-bin/lfscounter.cgi
+#MASTER# UNBLOCK-REFERRER: http://www.wholetomato.com/
+www.wholetomato.com/images/banner.jpg
+#MASTER# UNBLOCK-REFERRER: http://dv411.com/advc50.html
+dv411.com/advc50.html
 
 #############################################################################
 # Site-specific special rules:
@@ -875,6 +898,7 @@ adzapper.
 {fragile}
 .office.microsoft.com
 .windowsupdate.microsoft.com
+.apple.com
 
 #----------------------------------------------------------------------------
 # Shopping and banking sites - allow cookies and pop-ups
@@ -893,6 +917,7 @@ adzapper.
 .mobile.de
 www.fondationlejeu.com
 www.techtv.com
+.mywebgrocer.com
 
 #----------------------------------------------------------------------------
 # Subscription sites (with credible privacy policy) - allow permanent cookies
@@ -985,6 +1010,10 @@ web.archive.org
 .archive.org
 #MASTER# PROBLEM-URL: http://www.guenstiger.de/gt/link.asp?url=http://www.edv-supermarkt.de&source=produkt=238284&USID=00086443917155&hnr=2199&pnr=238284&ppr=158,00
 www.guenstiger.de
+#MASTER# PROBLEM-URL: http://anon.free.anonymizer.com/http://www.privoxy.org/
+.anonymizer.com
+#MASTER# PROBLEM-URL: http://www.mailtothefuture.com/public/logon?http://www.mailtothefuture.com/
+www.mailtothefuture.com
 
 #----------------------------------------------------------------------------
 # No filtering for sourcecode or other automatically parsed content
@@ -992,8 +1021,10 @@ www.guenstiger.de
 {-filter}
 #MASTER# PROBLEM-URL: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/ijbswa/current/
 cvs.
+/.*(cvs(view|web)|viewcvs)
 #MASTER# PROBLEM-URL: http://liveupdate.symantec.com/ennlu.x86
 liveupdate.symantec.com
+liveupdate.liveupdatesymantec.com
 #MASTER# PROBLEM-URL: http://www.bookmarklets.com/
 www.bookmarklets.com
 #MASTER# PROBLEM-URL: http://www.squarefree.com/bookmarklets/
@@ -1002,6 +1033,20 @@ www.squarefree.com/bookmarklets/
 #MASTER# REMARKS: Used by Mac OSX's automatic software update feature
 swquery.apple.com
 swscan.apple.com
+#MASTER# REMARKS: These are various US DSL speed tests sites, where MIME is wrong
+#MASTER# PROBLEM-URL: http://atl.speakeasy.net/300k
+.speakeasy.net/\d+k
+#MASTER# DONT-VERIFY
+#MASTER# REMARKS: These are exceptions to prevent text file corruption. Work-around!!!
+ /(.*/)?.*\.(PL|(s|p)?h|c(c|xx|pp)?|p?y|tcl|in|m4|diff|am|init?|cfg?|conf(ig)?|sgml?|css|txt|rc|bat|spec|log|patch|vb[es])$
+/(.*/)?(rc\.|README|Makefile|INSTALL|CPAN|txt|src)
+bugzilla.
+.dl.sourceforge.net
+.dl.sf.net
+.cpan.org
+cpan.
+.tldp.org
+
 
 #----------------------------------------------------------------------------
 # These sites suffer from a bug in PHP < 4.2.3 (ob_gzhandler broken;
@@ -1012,47 +1057,29 @@ swscan.apple.com
 www.powie.de
 #MASTER# PROBLEM-URL: http://www.phpcenter.de/
 www.phpcenter.de
-#MASTER# PROBLEM-URL: http://www.debianhelp.org/
-www.debianhelp.org
 #MASTER# PROBLEM-URL: http://www.timeanddate.com
 www.timeanddate.com
 #MASTER# PROBLEM-URL: http://www.pclinuxonline.com/
 #MASTER# PROBLEM-URL: http://pclinuxonline.com/
 .pclinuxonline.com
-#MASTER# PROBLEM-URL: http://www.dhd24.com/
-www.dhd24.com
-#MASTER# PROBLEM-URL: http://www.linuxandmain.com/
-.linuxandmain.com
-#MASTER# PROBLEM-URL: http://www.ofb.biz/
-.ofb.biz
 #MASTER# PROBLEM-URL: http://www.dungeoncrawl.org/
 .dungeoncrawl.org
-#MASTER# PROBLEM-URL: http://www.deviantart.com/
-.deviantart.com
-#MASTER# PROBLEM-URL: http://www.planetspiele.de/wbboard/
-www.planetspiele.de/wbboard/
 #MASTER# PROBLEM-URL: http://www.digitalspy.co.uk/
 www.digitalspy.co.uk
-#MASTER# PROBLEM-URL: http://www.dealnews.com/
-.dealnews.com   
 #MASTER# PROBLEM-URL: http://www.audio-illumination.org/forums/
 www.audio-illumination.org/forums/
 #MASTER# PROBLEM-URL: http://www.catchword.com/
 www.catchword.com
-#MASTER# PROBLEM-URL: http://www.mysql.com/
-www.mysql.com
 #MASTER# PROBLEM-URL: http://www.ubernet.org
 www.ubernet.org
 #MASTER# PROBLEM-URL: http://www.ooodocs.org/
 www.ooodocs.org
-#MASTER# PROBLEM-URL: http://ooextras.sourceforge.net/
-ooextras.sourceforge.net
 #MASTER# PROBLEM-URL: http://www.ntcompatible.com/
 www.ntcompatible.com
-#MASTER# PROBLEM-URL: http://www.jabbercentral.org/
-www.jabbercentral.org
-#MASTER# PROBLEM-URL: http://www.kde-look.org/    
-www.kde-look.org
+#MASTER# PROBLEM-URL: http://www.winehq.com/
+.winehq.com
+#MASTER# PROBLEM-URL: http://www.dotcomtod.de/
+.dotcomtod.de/
 
 #----------------------------------------------------------------------------
 # The first frame of the gif animation is more useful here:
@@ -1089,6 +1116,8 @@ www.connected-media.com/riven/
 www.wral.com
 #MASTER# PROBLEM-URL: http://www.canada.com/calgary/
 www.canada.com
+#MASTER# PROBLEM-URL: http://www.theonionavclub.com
+www.theonionavclub.com
 
 #----------------------------------------------------------------------------
 # These don't work without the referrer information:
@@ -1104,6 +1133,8 @@ printerfriendly.abcnews.com
 www.amazon.de/exec/obidos/clipserve/
 #MASTER# PROBLEM-URL: http://www.lufthansa.de/  http://www.lufthansa.com/  http://cms.lufthansa.com/ 
 .lufthansa.
+#MASTER# REMARKS: These are movie clips, linked from http://us.imdb.com
+.totaleclips.com
 
 #----------------------------------------------------------------------------
 # These animated gifs are either useful or nice:
@@ -1119,6 +1150,9 @@ www.ameritrade.com
 #MASTER# PROBLEM-URL: http://www.myrealbox.com/a?B.KL.U6wQ.d
 #MASTER# REMARKS: Bogus web server doesn't close connection -> deanimation doesn't terminate
 www.myrealbox.com
+#MASTER# PROBLEM-URL: http://weather.chicagotribune.com/radar/station.asp?ID=LOT19&type=loop
+#MASTER# REMARKS: These are weather radar images.
+.wunderground.com
 
 #----------------------------------------------------------------------------
 # These sites are so abusive that we need to kill all JS event bindings (and
@@ -1137,6 +1171,8 @@ www.myrealbox.com
 www.spiegel.de/static/js/flash-plugin\.js
 #MASTER# PROBLEM-URL: http://www.quelle-bausparkasse.de/
 www.quelle-bausparkasse.de/$
+#MASTER# PROBLEM-URL: http://de.groups.yahoo.com/group/die-spinner/interrupt?st=2&ln=die-spinner&m=1&done=%2Fgroup%2Fdie-spinner%2Fmessage%2F416
+.groups.yahoo.com/group/
 
 #----------------------------------------------------------------------------
 # Content under these TLDs is most probably in character sets which the
@@ -1147,6 +1183,7 @@ www.quelle-bausparkasse.de/$
 .cn
 .tw
 .ru
+.kr
 
 #----------------------------------------------------------------------------
 # Misc special rules:
@@ -1195,6 +1232,8 @@ www.dn.se
 #MASTER# PROBLEM-URL: http://www.munichre.com/
 #MASTER# REMARKS: Endless reload loop if referrer info supressed
 www.munichre.com
+#MASTER# PROBLEM-URL: http://www.sfgate.com
+.sfgate.com
 
 {-filter{unsolicited-popups}}
 #MASTER# DONT-VERIFY
@@ -1202,6 +1241,8 @@ www.munichre.com
 /.*mt.cgi$
 #MASTER# PROBLEM-URL: http://www.discovery.de/
 .discovery.de
+#MASTER# PROBLEM-URL: http://www.bankrate.com/yclc/calc/mortgage-calculator/mortgage-calculator.asp?
+www.bankrate.com/brm/
 
 {+block}
 #MASTER# PROBLEM-URL: http://www.anti-leech.com/theft_example.html
@@ -1210,3 +1251,8 @@ www.munichre.com
 
 {+filter{tiny-textforms}}
 .sourceforge.net/tracker
+
+{+downgrade-http-version}
+#MASTER# REMARKS: This is work-around for CUPS http configuration.
+:631
+
The official Privoxy git repository