X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=default.action.master;h=1a461d145d756398ea787a5ce4c856df836e35a8;hp=3bca3667bd9e0a739438a052dc37213388943787;hb=fffab6e6ee7719edef26f9cced06f3797be11312;hpb=7d56386a3cc53232245f20b2b448950181b5ab76 diff --git a/default.action.master b/default.action.master index 3bca3667..1a461d14 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.44 2006/11/14 01:54:35 hal9 Exp $ +# $Id: default.action.master,v 1.72 2007/04/12 02:57:46 hal9 Exp $ # -# Requires : This version requires Privoxy v3.0.5 or later due to +# Requires : This version requires Privoxy v3.0.7 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 - 2006 the +# Copyright : Written by and Copyright (C) 2001 - 2007 the # Privoxy team. http://www.privoxy.org/ # # Note: Updated versions of this file will be made available from time @@ -202,6 +202,14 @@ # Block this URL. Privoxy will ignore this URL completely, and not request # it. # +# +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 +# # +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. @@ -265,7 +273,7 @@ # be seen with View Source), not the headers. Repeat for multiple filters. # Use with caution: filters can be very intrusive. # -# Filters predefined in the supplied default.action include: +# Filters predefined in the supplied default.filter include: # # js-annoyances: Get rid of particularly annoying JavaScript abuse # js-events: Kill all JS event bindings (Radically destructive! Use only on real suckers) @@ -292,18 +300,7 @@ # yahoo: Removes text ads and other Yahoo specific improvements # msn: Removes text ads and other MSN specific improvements # blogspot: Cleans up Blogspot blogs -# html-to-xml: Header filter to change the Content-Type from html to xml -# xml-to-html: Header filter to change the Content-Type from xml to html # no-ping: Removes non-standard ping attributes from anchor and area tags -# hide-tor-exit-notation: Header filter to remove the Tor exit node notation in Host and Referer headers -# -# +filter-client-headers -# By default, filters only apply to the document content itself. This will -# extend those filters to include the client's headers as well. -# -# +filter-server-headers -# By default, filters only apply to the document content itself. This will -# extend those filters to include the server's headers as well. # # +force-text-mode # Declares a document as plain text, even if the "Content-Type:" isn't detected @@ -336,7 +333,7 @@ # specified e-mail address. # # +hide-if-modified-since{block} -# +hide-if-modified-since{-1} +# +hide-if-modified-since{-60} # Deletes the "If-Modified-Since:" HTTP client header or modifies its # value, preventing another way to track users. # @@ -371,26 +368,11 @@ # +inspect-jpegs # Scan jpeg headers for malformed comment blocks and correct them. # -# +set-image-blocker{blank} -# +set-image-blocker{pattern} -# +set-image-blocker{} with being any valid image URL -# Decides what to do with URLs that end up tagged with {+block +handle-as-image}. -# There are 4 options: -# * "-set-image-blocker" will send a HTML "blocked" page, usually -# resulting in a "broken image" icon. -# * "+set-image-blocker{blank}" will send a 1x1 transparent image -# * "+set-image-blocker{pattern}" will send a 4x4 grey/white pattern -# which is less intrusive than the logo but easier to recognize -# than the transparent one. -# * "+set-image-blocker{}" will send a HTTP temporary redirect -# to the specified image URL. -# -# # +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 # connects to the server on the specified port, and then short-circuits -# its connections to the cliant and to the remote proxy. +# its connections to the client and to the remote proxy. # This can be a big security hole, since CONNECT-enabled proxies can # be abused as TCP relays very easily. # By default, i.e. in the absence of a +limit-connect action, Privoxy @@ -428,13 +410,36 @@ # and +gif-deanimate will not work on compressed data. Will slow down # connections to those websites, though. # -# +prevent-keeping-cookies +# +server-header-filter{name} +# All server headers to which this action applies are filtered on-the-fly +# through the specified regular expression based substitutions. +# +# 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 +# # +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, # but won't break sites which require cookies so that you can log in # or for transactions. # +# +set-image-blocker{blank} +# +set-image-blocker{pattern} +# +set-image-blocker{} with being any valid image URL +# Decides what to do with URLs that end up tagged with {+block +handle-as-image}. +# There are 4 options: +# * "-set-image-blocker" will send a HTML "blocked" page, usually +# resulting in a "broken image" icon. +# * "+set-image-blocker{blank}" will send a 1x1 transparent image +# * "+set-image-blocker{pattern}" will send a 4x4 grey/white pattern +# which is less intrusive than the logo but easier to recognize +# than the transparent one. +# * "+set-image-blocker{}" will send a HTTP temporary redirect +# to the specified image URL. +# +# # +crunch-outgoing-cookies # Prevent the website from reading cookies # @@ -447,6 +452,7 @@ # equivalent. # # +redirect{} +# +redirect{} # Convinces the browser that the requested document has been moved to # another location and the browser should get it from the specified # URL. @@ -481,7 +487,7 @@ {{settings}} ############################################################################# #MASTER# COMMENT: The minimum Privoxy version: -for-privoxy-version=3.0.6 +for-privoxy-version=3.0.7 ############################################################################# # Aliases @@ -536,6 +542,7 @@ allow-ads = -block -filter{banners-by-size} -filter{banners-by-link} { \ -add-header \ -block \ +-client-header-filter{hide-tor-exit-notation} \ -content-type-overwrite \ -crunch-client-header \ -crunch-if-none-match \ @@ -570,12 +577,7 @@ allow-ads = -block -filter{banners-by-size} -filter{banners-by-link} -filter{yahoo} \ -filter{msn} \ -filter{blogspot} \ --filter{xml-to-html} \ --filter{html-to-xml} \ -filter{no-ping} \ --filter{hide-tor-exit-notation} \ --filter-client-headers \ --filter-server-headers \ -force-text-mode \ -handle-as-empty-document \ -handle-as-image \ @@ -594,6 +596,8 @@ allow-ads = -block -filter{banners-by-size} -filter{banners-by-link} -redirect \ -send-vanilla-wafer \ -send-wafer \ +-server-header-filter{xml-to-html} \ +-server-header-filter{html-to-xml} \ -session-cookies-only \ +set-image-blocker{pattern} \ -treat-forbidden-connects-like-blocks \ @@ -659,19 +663,22 @@ countr*. {+block} #MASTER# DONT-VERIFY (generic) /(.*/)?ad(\?|/|s|v|_?(image|se?rv|box)|cycle|rotate|mentor|click|f[ra]m|script|stream|fetch|log|space) -/.*ads(new)?/ +/phpads(new)?/ /(.*/)?(ad|all|nn|db|promo(tion)?)?[-_]?banner /(.*/)?(publicite|werbung|reklaa?m|annonse|maino(kset|nta|s)?/) /.*(count|track|compteur|(?