X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=standard.action;h=ac414a404791bbd83a05e42f169f11613140ded0;hb=dfd5a3ced69851300f203f904334d3e44b004176;hp=cbb1672d92d2068c5b94ca3e12845036d62b1279;hpb=72081f829de368392d04076728f8c991178c0080;p=privoxy.git

diff --git a/standard.action b/standard.action
index cbb1672d..ac414a40 100644
--- a/standard.action
+++ b/standard.action
@@ -2,23 +2,24 @@
 # 
 #  File        :  $Source: /cvsroot/ijbswa/current/standard.action,v $
 # 
-#  $Id: standard.action,v 1.2.2.9 2003/04/01 09:49:50 oes Exp $
+#  $Id: standard.action,v 1.16 2006/10/03 11:12:16 hal9 Exp $
 #
 #  Purpose     :  Provide prefedined sets of actions, see
 #                 http://www.privoxy.org/user-manual/actions-file.html
 #
-#  Copyright   :  Written by and Copyright
+#  Copyright   :  Written by and Copyright 2002-2006
 #                 Privoxy team. http://www.privoxy.org/
 #
 ######################################################################
 
 ######################################################################
 #
-# CAUTION: THIS FILE IS *NOT* THE PLACE TO CUSTOMIZE YOUR CONFIGURATION!
+# WARNING: THIS FILE IS *NOT* THE PLACE TO CUSTOMIZE YOUR CONFIGURATION!
 #
-#          If you want to customize Privoxy to suit your needs, 
-#          you can alter the default section in default.action and/or
-#          add your personal exceptions and extensions to user.action
+#          This is not a user modifiable configuration file!
+#          Local customizations and preferences should go in 
+#          user.action and/or user.filter. Or use the custom editor at
+#          http://p.p/. Thanks.
 #
 ######################################################################
 
@@ -29,22 +30,26 @@
 { \
 -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-annoyances} \
 -filter{js-events} \
-+filter{html-annoyances} \
+-filter{html-annoyances} \
 -filter{content-cookies} \
 -filter{refresh-tags} \
-+filter{unsolicited-popups} \
+-filter{unsolicited-popups} \
 -filter{all-popups} \
 -filter{img-reorder} \
-+filter{banners-by-size} \
+-filter{banners-by-size} \
 -filter{banners-by-link} \
-+filter{webbugs} \
+-filter{webbugs} \
 -filter{tiny-textforms} \
 -filter{jumping-windows} \
 -filter{frameset-borders} \
@@ -55,18 +60,37 @@
 -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 \
+-prevent-compression \
+-overwrite-last-modified \
+-redirect \
 -send-vanilla-wafer \
 -send-wafer \
 -session-cookies-only \
 +set-image-blocker{pattern} \
+-treat-forbidden-connects-like-blocks \
 }
 standard.Cautious
 
@@ -77,17 +101,21 @@ standard.Cautious
 { \
 -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 \
-+filter{js-annoyances} \
+-filter{js-annoyances} \
 -filter{js-events} \
-+filter{html-annoyances} \
+-filter{html-annoyances} \
 -filter{content-cookies} \
 +filter{refresh-tags} \
-+filter{unsolicited-popups} \
+-filter{unsolicited-popups} \
 -filter{all-popups} \
 +filter{img-reorder} \
 +filter{banners-by-size} \
@@ -103,39 +131,69 @@ standard.Cautious
 -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{forge} \
 -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 \
 }
 standard.Medium
 
 ################
 #
-# Advanced settings -- fun but risky (and include new filters)
+# 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.
 #
 { \
-+add-header{X-User-Tracking: sucks} \
+-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 \
-+filter{js-annoyances} \
++fast-redirects{check-decoded-url} \
+-filter{js-annoyances} \
 -filter{js-events} \
 +filter{html-annoyances} \
 +filter{content-cookies} \
 +filter{refresh-tags} \
-+filter{unsolicited-popups} \
+-filter{unsolicited-popups} \
 -filter{all-popups} \
 +filter{img-reorder} \
 +filter{banners-by-size} \
@@ -144,24 +202,43 @@ standard.Medium
 -filter{tiny-textforms} \
 +filter{jumping-windows} \
 +filter{frameset-borders} \
-+filter{demoronizer} \
+-filter{demoronizer} \
 -filter{shockwave-flash} \
 +filter{quicktime-kioskmode} \
-+filter{fun} \
+-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{-60} \
 +hide-forwarded-for-headers \
 +hide-from-header{block} \
-+hide-referrer{forge} \
++hide-referrer{conditional-block} \
 -hide-user-agent \
+-inspect-jpegs \
 -kill-popups \
--limit-connect \
++limit-connect{,} \
 +prevent-compression \
++overwrite-last-modified{randomize} \
+-redirect \
 -send-vanilla-wafer \
 -send-wafer \
 -session-cookies-only \
 +set-image-blocker{pattern} \
++treat-forbidden-connects-like-blocks \
 }
-standard.Adventuresome
+standard.Advanced