X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=default.action.master;h=425b5796ea249d466f2fcef9cc4a55d210f93103;hp=d8f034aaddd352452a7cd9a18b2d5513f184cc54;hb=46dcef7ea474f37fae003888b4079b8d450fc936;hpb=b80c8ea4ad407b281d23f69c7d774fc7a737b695 diff --git a/default.action.master b/default.action.master index d8f034aa..425b5796 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.127 2008/05/11 14:58:39 fabiankeil Exp $ +# $Id: default.action.master,v 1.160 2009/01/13 16:44:32 fabiankeil Exp $ # -# Requires : This version requires Privoxy v3.0.9 or later due to +# Requires : This version requires Privoxy v3.0.11 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-2008 the +# Copyright : Written by and Copyright (C) 2001-2009 the # Privoxy team. http://www.privoxy.org/ # # Note: Updated versions of this file will be made available from time @@ -202,6 +202,11 @@ # Block this URL. Instead of forwarding the request, Privoxy will # send a "block" page containing the specified reason. # +# +change-x-forwarded-for{add} +# +change-x-forwarded-for{block} +# Adds or blocks the "X-Forwarded-For:" HTTP header in client +# requests. +# # +client-header-filter{name} # All client headers to which this action applies are filtered on-the-fly # through the specified regular expression based substitutions. @@ -312,7 +317,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 +344,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 @@ -350,9 +360,6 @@ # servers. This can be used to prevent download menus for content you # prefer to view inside the browser, for example. # -# +hide-forwarded-for-headers -# Block any existing X-Forwarded-for header. -# # +hide-from-header{block} # +hide-from-header{spam@sittingduck.xqq} # If the browser sends a "From:" header containing your e-mail address, @@ -387,11 +394,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 +432,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. # @@ -500,7 +502,7 @@ {{settings}} ############################################################################# #MASTER# COMMENT: The minimum Privoxy version: -for-privoxy-version=3.0.9 +for-privoxy-version=3.0.11 ############################################################################# # Aliases @@ -553,12 +555,82 @@ allow-ads = -block -filter{banners-by-size} -filter{banners-by-link} # Defaults ############################################################################# { \ -+hide-forwarded-for-headers \ ++change-x-forwarded-for{block} \ +hide-from-header{block} \ +set-image-blocker{pattern} \ } / # Match all URLs +################ +# +# Cautious settings -- safe for all sites, but offer little privacy protection +# +{ \ ++change-x-forwarded-for{block} \ ++hide-from-header{block} \ ++set-image-blocker{pattern} \ +} +standard.Cautious + +################ +# +# Medium settings -- safe for most sites, with reasonable protection/damage tradeoff +# +{ \ ++change-x-forwarded-for{block} \ ++deanimate-gifs{last} \ ++filter{refresh-tags} \ ++filter{img-reorder} \ ++filter{banners-by-size} \ ++filter{webbugs} \ ++filter{jumping-windows} \ ++filter{ie-exploits} \ ++hide-from-header{block} \ ++hide-referrer{conditional-block} \ ++session-cookies-only \ ++set-image-blocker{pattern} \ +} +standard.Medium + +################ +# +# Advanced settings -- reasonable privacy protection but +# require some exceptions for trusted sites, most likely +# because of cookies or SSL. Also testing ground for +# new options. +# +# CAUTION: These settings can still be subverted by a +# misconfigured client that executes code from untrusted +# sources. +# +{ \ ++change-x-forwarded-for{block} \ ++client-header-tagger{css-requests} \ ++client-header-tagger{image-requests} \ ++crunch-if-none-match \ ++crunch-outgoing-cookies \ ++crunch-incoming-cookies \ ++deanimate-gifs{last} \ ++fast-redirects{check-decoded-url} \ ++filter{html-annoyances} \ ++filter{content-cookies} \ ++filter{refresh-tags} \ ++filter{img-reorder} \ ++filter{banners-by-size} \ ++filter{banners-by-link} \ ++filter{webbugs} \ ++filter{jumping-windows} \ ++filter{frameset-borders} \ ++filter{quicktime-kioskmode} \ ++hide-if-modified-since{-60} \ ++hide-from-header{block} \ ++hide-referrer{conditional-block} \ ++limit-connect{,} \ ++overwrite-last-modified{randomize} \ ++set-image-blocker{pattern} \ +} +standard.Advanced + ############################################################################# # These extensions belong to images: ############################################################################# @@ -576,7 +648,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 +671,6 @@ metrics. # Generic unblockers by host: ############################################################################# {-block} -#MASTER# DONT-VERIFY (generic) adsl. ad[udmw]*. adbl*. @@ -610,7 +680,6 @@ adob*. adrenaline. adtp*. adv[oia]*. -#MASTER# REMARKS: Added 2008-02-08 HB adventure*. .*road*. .olympiad*. @@ -623,16 +692,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|(?