From 7142c8e14ed2fe02be14751bb94366e59b8ce562 Mon Sep 17 00:00:00 2001 From: hal9 Date: Fri, 1 Sep 2006 14:36:58 +0000 Subject: [PATCH] Include the new actions in both the comment section and the "Defaults" section. --- default.action.master | 120 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 109 insertions(+), 11 deletions(-) diff --git a/default.action.master b/default.action.master index cb2d46f8..74927132 100644 --- a/default.action.master +++ b/default.action.master @@ -2,12 +2,12 @@ # # File : $Source: /cvsroot/ijbswa/current/default.action.master,v $ # -# $Id: default.action.master,v 1.14 2006/08/29 00:39:54 david__schmidt Exp $ +# $Id: default.action.master,v 1.15 2006/08/29 01:46:23 david__schmidt Exp $ # # Purpose : Default actions file, see # http://www.privoxy.org/user-manual/actions-file.html # -# Copyright : Written by and Copyright (C) 2001 - 2004 the +# Copyright : Written by and Copyright (C) 2001 - 2006 the # Privoxy team. http://www.privoxy.org/ # # Note: Updated versions of this file will be made available from time @@ -185,6 +185,21 @@ # +block # Block this URL # +# +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. +# +# +crunch-client-header{string} +# Deletes every header sent by the client that contains the string the +# user supplied as parameter. +# +# +crunch-if-none-match +# Deletes the "If-None-Match:" HTTP client header. +# +# +crunch-server-header{string} +# Deletes every header sent by the server that contains the string the +# user supplied as a parameter. +# # +deanimate-gifs{last} # +deanimate-gifs{first} # Deanimate all animated GIF images, i.e. reduce them to their last @@ -202,6 +217,7 @@ # protocol features that Privoxy currently can't handle yet. # # +fast-redirects{check-decoded-url} +# +fast-redirects{simple-check} # Many sites, like yahoo.com, don't just link to other sites. # Instead, they will link to some script on their own server, # giving the destination as a parameter, which will then redirect @@ -217,10 +233,10 @@ # time is wasted, while your browser aks the server for one redirect # after the other. Plus, it feeds the advertisers. # -# The +fast-redirects{check-decoded-url} option enables interception of these requests -# by Privoxy, who will cut off all but the last valid URL in the -# request and send a local redirect back to your browser without -# contacting the intermediate sites. +# The +fast-redirects{check-decoded-url} option enables interception of +# these requests by Privoxy, who will cut off all but the last valid URL +# in the request and send a local redirect back to your browser without +# contacting the intermediate sites. NOTE: Syntax change as of v.3.0.4. # # +filter{name} # Filter the website through one or more regular expression filters. @@ -250,14 +266,48 @@ # ie-exploits: Disable some known Internet Explorer bug exploits # site-specifics Cure for site-specific problems. Don't apply generally! # +# +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 +# as such. +# +# +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 +# decides whether an HTML "blocked" page, or an empty document will be sent +# to the client as a substitute for the blocked content. +# +# +hide-accept-language{lang} +# +hide-accept-language{block} +# Deletes or replaces the "Accept-Language:" HTTP header in client +# requests. +# +# +hide-content-disposition{block} +# +hide-content-disposition{string} +# Deletes or replaces the "Content-Disposition:" HTTP header set by some +# 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, and do not add a new one. +# Block any existing X-Forwarded-for header, and do not add a new one. # # +hide-from-header{block} # +hide-from-header{spam@sittingduck.xqq} -# If the browser sends a "From:" header containing your e-mail address, -# either completely removes the header ("block"), or change it to the -# specified e-mail address. +# If the browser sends a "From:" header containing your e-mail address, +# either completely removes the header ("block"), or change it to the +# specified e-mail address. +# +# +hide-if-modified-since{block} +# +hide-if-modified-since{-1} +# Deletes the "If-Modified-Since:" HTTP client header or modifies its +# value, preventing another way to track users. # # +hide-referer{block} # +hide-referer{forge} @@ -323,6 +373,24 @@ # +limit-connect{80,443} # Ports 80 and 443 are OK. # +limit-connect{-3, 7, 20-100, 500-} # Port less than 3, 7, 20 to 100, and above 500 are OK. # +# +overwrite-last-modified{block} +# +overwrite-last-modified{reset-to-request-time} +# +overwrite-last-modified{randomize} +# Removing the "Last-Modified:" header is useful for filter testing, where +# you want to force a real reload instead of getting status code "304", +# which would cause the browser to reuse the old version of the page. +# +# The "randomize" option overwrites the value of the "Last-Modified:" +# header with a randomly chosen time between the original value and the +# current time. In theory the server could send each document with a +# different "Last-Modified:" header to track visits without using cookies. +# "Randomize" makes it impossible and the browser can still revalidate +# cached documents. +# +# "reset-to-request-time" overwrites the value of the "Last-Modified:" +# header with the current time. You could use this option together with +# hided-if-modified-since to further customize your random range. +# # +prevent-compression # Prevent the website from compressing the data. Some websites do # that, which is a problem for Privoxy, since +filter, +kill-popups @@ -347,6 +415,11 @@ # window.open() etc. The two alternative spellings are # equivalent. # +# +redirect{} +# Convinces the browser that the requested document has been moved to +# another location and the browser should get it from the specified +# URL. +# # +send-vanilla-wafer # This action only applies if you are using a jarfile. It sends a # cookie to every site stating that you do not accept any copyright @@ -358,6 +431,17 @@ # 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. +# ############################################################################# ############################################################################# @@ -365,7 +449,7 @@ ############################################################################# {{settings}} ############################################################################# -for-privoxy-version=3.0.3 +for-privoxy-version=3.0.4 ############################################################################# # Aliases @@ -420,8 +504,12 @@ allow-ads = -block -filter{banners-by-size} -filter{banners-by-link} { \ -add-header \ -block \ +-content-type-overwrite \ +-crunch-client-header \ +-crunch-if-none-match \ -crunch-outgoing-cookies \ -crunch-incoming-cookies \ +-crunch-server-header \ +deanimate-gifs{last} \ -downgrade-http-version \ -fast-redirects \ @@ -446,7 +534,14 @@ allow-ads = -block -filter{banners-by-size} -filter{banners-by-link} -filter{crude-parental} \ +filter{ie-exploits} \ -filter{site-specifics} \ +-filter-client-headers \ +-filter-server-headers \ +-force-text-mode \ +-handle-as-empty-document -handle-as-image \ +-hide-accept-language \ +-hide-content-disposition \ +-hide-if-modified-since \ +hide-forwarded-for-headers \ +hide-from-header{block} \ +hide-referrer{forge} \ @@ -454,11 +549,14 @@ allow-ads = -block -filter{banners-by-size} -filter{banners-by-link} -inspect-jpegs \ -kill-popups \ -limit-connect \ +-overwrite-last-modified \ +-redirect \ +prevent-compression \ -send-vanilla-wafer \ -send-wafer \ +session-cookies-only \ +set-image-blocker{pattern} \ +-treat-forbidden-connects-like-blocks \ } / # Match all URLs -- 2.39.2