X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=default.action.master;h=15eed2f5bf563289e0b771c2d507b4410f17837b;hb=d1a32a688bb2d2e1020cd3e612c4629b5325f288;hp=9c5a9869aa725ea316980a597a7057bbd72a81ff;hpb=933fed7d6c9c8c3eb4c73f75400555101b89ec7e;p=privoxy.git diff --git a/default.action.master b/default.action.master index 9c5a9869..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.128 2008/05/12 09:44:40 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. @@ -312,7 +312,7 @@ # shockwave-flash: Kill embedded Shockwave Flash objects. # quicktime-kioskmode: Make Quicktime movies saveable. # fun: Text replacements for subversive browsing fun! -# crude-parental: Crude parental filtering. Note that this filter doesn't work reliable. +# crude-parental: Crude parental filtering. Note that this filter doesn't work reliably. # ie-exploits: Disable some known Internet Explorer bug exploits. # site-specifics: Cure for site-specific problems. Don't apply generally! # no-ping: Removes non-standard ping attributes in and tags. @@ -339,6 +339,11 @@ # decides whether an HTML "blocked" page, or an empty document will be sent # to the client as a substitute for the blocked content. # +# +handle-as-image +# Treat this URL as an image. This only matters if it's also "+block"ed, +# in which case a "blocked" image can be sent rather than a HTML page. +# See +set-image-blocker{} for the control over what is actually sent. +# # +hide-accept-language{lang} # +hide-accept-language{block} # Deletes or replaces the "Accept-Language:" HTTP header in client @@ -387,11 +392,6 @@ # +hide-user-agent{Privoxy/1.0} # (Don't change the version number from 1.0 - after all, why tell them?) # -# +handle-as-image -# Treat this URL as an image. This only matters if it's also "+block"ed, -# in which case a "blocked" image can be sent rather than a HTML page. -# See +set-image-blocker{} for the control over what is actually sent. -# # +limit-connect{portlist} # The CONNECT methods exists in HTTP to allow access to secure websites # (https:// URLs) through proxies. It works very simply: The proxy @@ -430,7 +430,7 @@ # # +prevent-compression # Prevent the website from compressing the data. Some websites do -# that, which is a problem for Privoxy when build without zlib support, +# that, which is a problem for Privoxy when built without zlib support, # since +filter and +gif-deanimate will not work on compressed data. # Will slow down connections to those websites, though. # @@ -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|(?