X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=default.action.master;h=fcd3e8409abc348dc3d8e70492320d8f9d0ad202;hp=43b4d36342226b3ca74bf108e2901e0d18ef4e16;hb=806ef4d428babf1580bf8ea21e742740f4f4ebbd;hpb=1c182873a7f17106dbc704a7d14629cb0032b4ee diff --git a/default.action.master b/default.action.master index 43b4d363..fcd3e840 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.39 2006/10/24 10:53:55 hal9 Exp $ +# $Id: default.action.master,v 1.103 2007/12/13 00:38:01 hal9 Exp $ # -# Requires : This version requires Privoxy v3.0.4 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 @@ -122,7 +122,7 @@ # Additionally, there are wildcards that you can use in the domain names # themselves. They work pretty similar to shell wildcards: "*" stands for # zero or more arbitrary characters, "?" stands for one, and you can define -# charachter classes in square brackets and they can be freely mixed: +# character classes in square brackets and they can be freely mixed: # # ad*.example.com # matches adserver.example.com, ads.example.com, etc but not sfads.example.com @@ -158,7 +158,7 @@ # will match only documents whose path starts with PaTtErN in exactly this # capitalization. # -# Partially case-sensetive and partially case-insensitive patterns are +# Partially case-sensitive and partially case-insensitive patterns are # possible, but the rules about splitting them up are extremely complex # - see the PCRE documentation for more information. # @@ -202,6 +202,21 @@ # 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 +# +# +client-header-tagger{string} +# Block requests based on their headers. Client headers to which this +# action applies are filtered on-the-fly through the specified regular +# expression based substitutions, the result is used as a tag. +# Client-header taggers are the first actions that are executed and their +# tags can be used to control every other action. +# # +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. @@ -244,10 +259,10 @@ # http://some.place/some_script?http://some.where-else # # Sometimes, there are even multiple consecutive redirects encoded -# in the URL. These redirections via scripts make your web browing +# in the URL. These redirections via scripts make your web browsing # more traceable, since the server from which you follow such a link # can see where you go to. Apart from that, valuable bandwidth and -# time is wasted, while your browser aks the server for one redirect +# time is wasted, while your browser asks the server for one redirect # after the other. Plus, it feeds the advertisers. # # The +fast-redirects{check-decoded-url} option enables interception of @@ -265,7 +280,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 +307,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 +340,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 +375,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 +417,44 @@ # 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 +# +# +server-header-tagger{content-type} +# Server headers to which this action applies are filtered on-the-fly +# through the specified regular expression based substitutions, the result +# is used as a tag. Server-header taggers are executed before all other +# header actions that modify server headers. Their tags can be used to +# control all of the other server-header actions, the content filters and +# the crunch actions (redirect and block). +# # +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 +467,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 +502,7 @@ {{settings}} ############################################################################# #MASTER# COMMENT: The minimum Privoxy version: -for-privoxy-version=3.0.5 +for-privoxy-version=3.0.7 ############################################################################# # Aliases @@ -534,69 +555,9 @@ allow-ads = -block -filter{banners-by-size} -filter{banners-by-link} # Defaults ############################################################################# { \ --add-header \ --block \ --content-type-overwrite \ --crunch-client-header \ --crunch-if-none-match \ --crunch-outgoing-cookies \ --crunch-incoming-cookies \ --crunch-server-header \ --deanimate-gifs \ --downgrade-http-version \ --fast-redirects \ --filter{js-annoyances} \ --filter{js-events} \ --filter{html-annoyances} \ --filter{content-cookies} \ --filter{refresh-tags} \ --filter{unsolicited-popups} \ --filter{all-popups} \ --filter{img-reorder} \ --filter{banners-by-size} \ --filter{banners-by-link} \ --filter{webbugs} \ --filter{tiny-textforms} \ --filter{jumping-windows} \ --filter{frameset-borders} \ --filter{demoronizer} \ --filter{shockwave-flash} \ --filter{quicktime-kioskmode} \ --filter{fun} \ --filter{crude-parental} \ --filter{ie-exploits} \ --filter{site-specifics} \ --filter{google} \ --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 \ --hide-accept-language \ --hide-content-disposition \ --hide-if-modified-since \ +hide-forwarded-for-headers \ +hide-from-header{block} \ --hide-referrer \ --hide-user-agent \ --inspect-jpegs \ --kill-popups \ --limit-connect \ --prevent-compression \ --overwrite-last-modified \ --redirect \ --send-vanilla-wafer \ --send-wafer \ --session-cookies-only \ +set-image-blocker{pattern} \ --treat-forbidden-connects-like-blocks \ } / # Match all URLs @@ -620,7 +581,12 @@ allow-ads = -block -filter{banners-by-size} -filter{banners-by-link} #MASTER# DONT-VERIFY (generic) ad*. .*ads. -.ad. +#MASTER# REMARKS: removed .ad. 2007-12-18 HB +#MASTER# REMARKS: Modifications per Actionsfile feedback item #1807613 +.ad.?. +.ad.[a-ik-z][a-oq-z]. +.ad.jp.*. +.ad.???*. #MASTER# PROBLEM URL: http://alternativos.iw-advertising.com/ .*advert*. *banner*. @@ -659,19 +625,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|adframe|adse?rve?|banner)(er|run)?(\?|\.(pl|cgi|exe|dll|asp|php|cpt)) +/.*(count|track|compteur|(?