X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=default.action.master;h=fbe30ce42a39edbf8c7c16ee305e2fdc1ceaa1c2;hp=23204350ea2ff102053d49733dd969d6b9bd54ce;hb=9e02e023b95985efba498e6e42caaea5f73f6d10;hpb=80c69e79035306553c98dce23cd15fc42b6697fe diff --git a/default.action.master b/default.action.master index 23204350..fbe30ce4 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.126 2008/04/22 16:05:57 fabiankeil Exp $ +# $Id: default.action.master,v 1.150 2008/11/20 11:19:34 hal9 Exp $ # # Requires : This version requires Privoxy v3.0.9 or later due to # syntax changes. @@ -202,13 +202,19 @@ # 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. # # Client-header filters predefined in the supplied default.filter include: # -# hide-tor-exit-notation: Removes the Tor exit node notation in Host and Referer headers +# hide-tor-exit-notation: Removes the Tor exit node notation in Host and Referer headers. +# privoxy-control: Removes X-Privoxy-Control headers. # # +client-header-tagger{string} # Tag requests based on their headers. Client headers to which this @@ -217,6 +223,17 @@ # Client-header taggers are the first actions that are executed and their # tags can be used to control every other action. # +# Client-header taggers predefined in the supplied default.filter include: +# +# image-requests: Tags detected image requests as "IMAGE-REQUEST". +# css-requests: Tags detected CSS requests as "CSS-REQUEST". +# client-ip-address: Tags the request with the client's IP address. +# http-method: Tags the request with its HTTP method. +# allow-post: Tags POST requests as "ALLOWED-POST". +# complete-url: Tags the request with the whole request URL. +# user-agent: Tags the request with the complete User-Agent header. +# privoxy-control: Creates tags with the content of X-Privoxy-Control headers. +# # +content-type-overwrite # Replaces the "Content-Type:" HTTP server header, so that unwanted # download menus will not pop up, or changes the browser's rendering mode. @@ -300,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. @@ -327,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 @@ -338,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, @@ -375,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 @@ -418,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. # @@ -428,8 +442,11 @@ # # Server-header filters predefined in the supplied default.filter include: # -# html-to-xml: Changes the Content-Type header from html to xml -# xml-to-html: Changes the Content-Type header from xml to html +# x-httpd-php-to-html: Changes the Content-Type header from x-httpd-php to html. +# html-to-xml: Changes the Content-Type header from html to xml. +# xml-to-html: Changes the Content-Type header from xml to html. +# less-download-windows: Prevent annoying download windows for content types the browser can handle itself. +# privoxy-control: Removes X-Privoxy-Control headers. # # +server-header-tagger{content-type} # Server headers to which this action applies are filtered on-the-fly @@ -439,6 +456,11 @@ # control all of the other server-header actions, the content filters and # the crunch actions (redirect and block). # +# Server-header taggers predefined in the supplied default.filter include: +# +# content-type: Tags the request with the content type declared by the server. +# privoxy-control: Creates tags with the content of X-Privoxy-Control headers. +# # +session-cookies-only # If the website sets cookies, make sure they are erased when you exit # and restart your web browser. This makes profiling cookies useless, @@ -480,7 +502,7 @@ {{settings}} ############################################################################# #MASTER# COMMENT: The minimum Privoxy version: -for-privoxy-version=3.0.9 +for-privoxy-version=3.0.11 ############################################################################# # Aliases @@ -533,7 +555,7 @@ 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} \ } @@ -556,7 +578,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 @@ -580,7 +601,6 @@ metrics. # Generic unblockers by host: ############################################################################# {-block} -#MASTER# DONT-VERIFY (generic) adsl. ad[udmw]*. adbl*. @@ -590,7 +610,6 @@ adob*. adrenaline. adtp*. adv[oia]*. -#MASTER# REMARKS: Added 2008-02-08 HB adventure*. .*road*. .olympiad*. @@ -603,16 +622,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|(?