X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=default.action.master;h=bcd93106e7581a5dfd2666d2efc48fff9fdcdf12;hp=4a9a8fa198e194818c9244bbd5216a20fc59e38e;hb=3b87fda093b388278d752ebff6e0892327376f87;hpb=76c74f077c33b5833c2f0eeb737f20af7fa36a8d diff --git a/default.action.master b/default.action.master index 4a9a8fa1..bcd93106 100644 --- a/default.action.master +++ b/default.action.master @@ -9,9 +9,9 @@ # # File : $Source: /cvsroot/ijbswa/current/default.action.master,v $ # -# $Id: default.action.master,v 1.100 2007/11/12 19:00:33 fabiankeil Exp $ +# $Id: default.action.master,v 1.115 2008/03/04 18:30:39 fabiankeil Exp $ # -# Requires : This version requires Privoxy v3.0.7 or later due to +# Requires : This version requires Privoxy v3.0.9 or later due to # syntax changes. # # Purpose : Default actions file, see @@ -19,7 +19,7 @@ # This file is subject to periodic updating. Local exceptions # and enhancements are better placed in user.action. # -# Copyright : Written by and Copyright (C) 2001 - 2007 the +# Copyright : Written by and Copyright (C) 2001-2008 the # Privoxy team. http://www.privoxy.org/ # # Note: Updated versions of this file will be made available from time @@ -168,7 +168,7 @@ # # There are 3 kinds of actions: # -# Boolean (e.g. "block"): +# Boolean (e.g. "handle-as-image"): # +name # enable # -name # disable # @@ -198,9 +198,9 @@ # Adds the specified HTTP header, which is not checked for validity. # You may specify this many times to specify many headers. # -# +block -# Block this URL. Privoxy will ignore this URL completely, and not request -# it. +# +block{reason} +# Block this URL. Instead of forwarding the request, Privoxy will +# send a "block" page containing the specified reason. # # +client-header-filter{name} # All client headers to which this action applies are filtered on-the-fly @@ -211,7 +211,7 @@ # hide-tor-exit-notation: Removes the Tor exit node notation in Host and Referer headers # # +client-header-tagger{string} -# Block requests based on their headers. Client headers to which this +# Tag requests based on their headers. Client headers to which this # action applies are filtered on-the-fly through the specified regular # expression based substitutions, the result is used as a tag. # Client-header taggers are the first actions that are executed and their @@ -313,6 +313,14 @@ # Declares a document as plain text, even if the "Content-Type:" isn't detected # as such. # +# +forward-override{forward .} +# +forward-override{forward 127.0.0.1:8123} +# +forward-override{forward-socks4a 127.0.0.1:9050 .} +# +forward-override{forward-socks4a 127.0.0.1:9050 proxy.example.org:8000} +# +forward-override{forward-socks5 127.0.0.1:9050 .} +# +forward-override{forward-socks5 127.0.0.1:9050 proxy.example.org:8000} +# This action overrules the forward directives in the configuration file. +# # +handle-as-empty-document # This action alone doesn't do anything noticeable. It just marks URLs. If # the block action also applies, the presence or absence of this mark @@ -331,7 +339,7 @@ # prefer to view inside the browser, for example. # # +hide-forwarded-for-headers -# Block any existing X-Forwarded-for header, and do not add a new one. +# Block any existing X-Forwarded-for header. # # +hide-from-header{block} # +hide-from-header{spam@sittingduck.xqq} @@ -483,17 +491,6 @@ # This allows you to add an arbitrary cookie. Specify it multiple # times in order to add several cookies. # -# +treat-forbidden-connects-like-blocks -# If this action is enabled, Privoxy no longer makes a difference between -# forbidden connects and ordinary blocks. -# -# By default Privoxy answers forbidden "Connect" requests with a short -# error message inside the headers. If the browser doesn't display headers -# (most don't), you just see an empty page. With this action enabled, -# Privoxy displays the message that is used for ordinary blocks instead. If -# you decide to make an exception for the page in question, you can do so -# by following the "See why" link. -# ############################################################################# ############################################################################# @@ -502,7 +499,7 @@ {{settings}} ############################################################################# #MASTER# COMMENT: The minimum Privoxy version: -for-privoxy-version=3.0.7 +for-privoxy-version=3.0.9 ############################################################################# # Aliases @@ -533,7 +530,7 @@ for-privoxy-version=3.0.7 -crunch-all-cookies = -crunch-incoming-cookies -crunch-outgoing-cookies allow-all-cookies = -crunch-all-cookies -session-cookies-only allow-popups = -filter{all-popups} -kill-popups -filter{unsolicited-popups} -+block-as-image = +block +handle-as-image ++block-as-image = +block{Blocked image request.} +handle-as-image -block-as-image = -block # These aliases define combinations of actions @@ -545,7 +542,7 @@ shop = -crunch-all-cookies allow-popups # Your favourite blend of filters: # myfilters = +filter{html-annoyances} +filter{js-annoyances} +filter{all-popups}\ - +filter{webbugs} +filter{nimda} +filter{banners-by-size} #+filter{fun} + +filter{webbugs} +filter{banners-by-size} # Allow ads for selected useful free sites: # @@ -577,11 +574,16 @@ allow-ads = -block -filter{banners-by-size} -filter{banners-by-link} ############################################################################# # Generic block patterns by host: ############################################################################# -{+block} +{+block{Host matches generic block pattern.}} #MASTER# DONT-VERIFY (generic) ad*. .*ads. -.ad. +#MASTER# REMARKS: removed .ad. 2007-12-18 HB +#MASTER# REMARKS: Modifications per Actionsfile feedback item #1807613 +.ad.?. +.ad.[a-ik-z][a-oq-z]. +.ad.jp.*. +.ad.???*. #MASTER# PROBLEM URL: http://alternativos.iw-advertising.com/ .*advert*. *banner*. @@ -607,6 +609,8 @@ adob*. adrenaline. adtp*. adv[oia]*. +#MASTER# REMARKS: Added 2008-02-08 HB +adventure*. .*road*. .olympiad*. .*load*. @@ -617,7 +621,7 @@ countr*. ############################################################################# # Generic block patterns by path: ############################################################################# -{+block} +{+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) /phpads(new)?/ @@ -657,7 +661,7 @@ support./(.*/)?track ############################################################################# # Catch-all for false-positives that are just TOO obvious to let go ############################################################################# -{+block} +{+block{Catch-all block for false-positives.}} #MASTER# PROBLEM URL: http://ads.facebook.com/ads/spreadshirt/banner120x600.jpg #MASTER# REMARKS: Going for adsrv, adserve, adserver*. .ads[erv][rv]*. @@ -671,6 +675,7 @@ support./(.*/)?track ############################################################################# # Site-specific block patterns; ############################################################################# +{+block{Site-specific block pattern matches.}} #MASTER# BLOCK-REFERRER: http://www.brooksbrothers.com/ 10/18/06 #MASTER# BLOCK-REFERRER: http://www.autodesk.com/ .hitbox.com @@ -793,7 +798,7 @@ linuxinsider.com/images/sda/ #---------------------------------------------------------------------------- # Misc Web-bugs, JS and just plain Junk. Images here aren't normal images. #---------------------------------------------------------------------------- -{+block +handle-as-empty-document -handle-as-image} +{+block{Might be a web-bug.} +handle-as-empty-document -handle-as-image} #MASTER# REMARKS: signature for user tracking nytimes, cnn.com,latimes.com and many others. 10/06/06 /b/ss/.+ #MASTER# BLOCK-REFERRER: http://www.thesun.co.uk/article/0,,11071-10784,00.html @@ -1132,6 +1137,9 @@ insightxe./data/ rss.slashdot.org/~a/Slashdot/slashdot\? #MASTER# PROBLEM URL: rss.slashdot.org/~r/Slashdot/slashdot/~4/102113044 rss.slashdot.org/~r/Slashdot/slashdot/~4/ +#MASTER# BLOCK-REFERRER: http://www.isys.ucl.ac.be/bchi/research/Kwaresmi.htm +#MASTER# REMAKRKS: Actionsfile feedback item #1849627 2007-12-12 +[a-z][0-9].nedstatbasic.net/ #---------------------------------------------------------------------------- # Specific counters (see above for generic patterns) @@ -1143,9 +1151,6 @@ s*.sitemeter.com/(meter|js/counter.js) fastcounter.bcentral.com/ #MASTER# BLOCK-REFERRER: http://osnews.com/ 10/19/06 bilbo.counted.com/ -#MASTER# BLOCK-REFERRER: http://enciclopedia.us.es/ -#MASTER# REMAKRKS: Not found, but leaving 10/19/06 -#[a-z][0-9].nedstatbasic.net/ #---------------------------------------------------------------------------- # On-site ads and other single sources: @@ -1303,7 +1308,7 @@ cels.org/.*track #MASTER# UNBLOCK-REFERRER: http://www.nic.ad.jp/ See http://jprs.co.jp/en/jpdomain.html 09/11/06 #MASTER# REMARKS: 2007-10-04, increase scope per Actionsfile feedback item #1807613 #.nic.ad.jp -.ad.jp +#MASTER# REMARKS removed .ad.jp per Actionsfile feedback item #1807613 #MASTER# UNBLOCK-REFERRER: http://www.flickr.com/photo_zoom.gne?id=32594118&size=l 09/11/06 #MASTER# REMARKS: creativecommons.org worthwhile organization 09/11/06 /(.*/)?somerights20.gif @@ -1374,6 +1379,17 @@ switch.atdmt.com/action/ #MASTER# UNBLOCK-REFERRER: redirect from http://go.microsoft.com/fwlink?linkid=51093 #MASTER# REMARKS: Actionsfile feedback item #1757121 2007-07-19 .microsoft.com/.*/adschema/ +#MASTER# UNBLOCK-REFERRER: http://upload.wikimedia.org/wikipedia/en/a/ad/Picturecarnegie.jpg +.wikimedia.org/ +#MASTER# UNBLOCK-REFERRER: http://en.wikipedia.org/wiki/Advertisement +.wikipedia.org/ +#MASTER# PROBLEM URL: http://curl.haxx.se/docs/adv_20070710.html +.haxx.se/docs/adv_ +#MASTER# PROBLEM URL: http://www.google.com/adsense/ +www.google.com/adsense/ +#MASTER# PROBLEM URL: http://www.encyclopediadramatica.com/Advertisement +#MASTER# PROBLEM URL: http://images.encyclopediadramatica.com/images/b/b5/Advertising-Dierentuin.jpg +.encyclopediadramatica.com/ ############################################################################# # Site-specific special rules: @@ -1529,6 +1545,10 @@ del.icio.us/ access.adobe.com/access/getStatus.do\?jobid=&srcPdfUrl= #MASTER# PROBLEM-URL: http://view.samurajdata.se/ps.php?url=http%3A%2F%2Fcups.cs.cmu.edu%2Fsoups%2F2007%2Fproceedings%2Fp41_clark.pdf&submit=View%21 view.samurajdata.se/ps\.php\?url= +#MASTER# PROBLEM-URL: http://www.blogger.com/navbar.g?targetBlogID=8919860543765866292&blogName=Kickin%27+the+Darkness&publishMode=PUBLISH_MODE_HOSTED&navbarType=BLUE&layoutType=LAYOUTS&homepageUrl=http%3A%2F%2Fblog.kickin-the-darkness.com%2F&searchRoot=http%3A%2F%2Fblog.kickin-the-darkness.com%2Fsearch +.blogger.com/navbar\.g +#MASTER# PROBLEM-URL: http://editors.dmoz.org/editors/editurl.cgi?url=http%3a//www.example.de/&cat=World/Deutsch/Computer/Hardware/Speichermedien +.dmoz.org/editors/editurl\.cgi #---------------------------------------------------------------------------- # No filtering for sourcecode or other automatically parsed content @@ -1700,6 +1720,12 @@ www.xach.com/gimp/ javabog.dk/ijk/ #MASTER# REMARK: Per Debian bug report #319025 09/09/06 .w3.org +#MASTER# PROBLEM-URL: http://www.encyclopediadramatica.com/New_Zealand_Fail_Guy +.encyclopediadramatica.com/ + +{-filter{banners-by-link}} +#MASTER# PROBLEM-URL: http://www.encyclopediadramatica.com/Advertisement +.encyclopediadramatica.com/ #---------------------------------------------------------------------------- # These don't work without the referrer information: @@ -1739,22 +1765,11 @@ schneegans.de/sv/\?url=referer #MASTER# REMARKS: 09/12/06 Art site, and ad-free .rubberslug.com -#---------------------------------------------------------------------------- -# These sites are so abusive that we need to kill all JS event bindings (and -# probably a break a lot along the way) -#---------------------------------------------------------------------------- -#MASTER# REMARKS: Surely this has changed. Commenting out 10/15/06 HB -#{+filter{js-radical}} -##MASTER# PROBLEM-URL: http://www.planetspiele.de/ -#.planetspiele.de -#216.12.219.40 - #---------------------------------------------------------------------------- # The "site-specifics" filter has special cures for problems found here: #---------------------------------------------------------------------------- #MASTER# REMARKS: This section NOT checked 10/15/06 HB. -{+filter{site-specifics} +prevent-compression} -#MASTER# REMARKS: +prevent-compression in case its off as a default setting. +{+filter{site-specifics}} #MASTER# PROBLEM-URL: http://www.spiegel.de/static/js/flash-plugin.js .spiegel.de/static/js/flash-plugin\.js #MASTER# PROBLEM-URL: http://www.quelle-bausparkasse.de/ @@ -1842,7 +1857,7 @@ dw.com.com/ .bloglines.com/r\? www.skweezer.net/bloglines -{+block} +{+block{Looks like an anti-leech trigger URL.}} #MASTER# COMMENTS: This section not checked 10/17/06 HB. Still out there? #MASTER# PROBLEM-URL: http://www.anti-leech.com/theft_example.html #MASTER# REMARKS: Lame attempt at banning ad-blockers. Used by other websites as well. @@ -1851,7 +1866,7 @@ www.skweezer.net/bloglines { +prevent-compression } .compusa.com/ -{+filter{tiny-textforms} +prevent-compression} +{+filter{tiny-textforms}} .sourceforge.net/tracker {+downgrade-http-version} @@ -1859,13 +1874,6 @@ www.skweezer.net/bloglines #MASTER# REMARKS: This is work-around for CUPS http configuration. :631 -#MASTER# REMARKS: What is this? Something special? -#{ -crunch-outgoing-cookies \ -# -crunch-incoming-cookies \ -# +session-cookies-only \ -#} -#www.versiontracker.com/ - #MASTER# REMARKS: If Privoxy is disabled, requests for config.privoxy.org/ #MASTER# REMARKS: reach privoxy.org and are redirected to privoxy.org/config. #MASTER# REMARKS: The instructions tell the user to reload the page with