X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=standard.action;h=a02ff24c4d671af32b7fedcede6a0d1d177b4b1a;hp=542b21b6d7af31f7513c06467a0722f8cd8ebfd0;hb=434ece4a211dd8347faa65b8cbae510a43db88e3;hpb=578b5ec72f1bb2ceebe5d0afca2327c9d7a22bf1

diff --git a/standard.action b/standard.action
index 542b21b6..a02ff24c 100644
--- a/standard.action
+++ b/standard.action
@@ -2,12 +2,12 @@
 # 
 #  File        :  $Source: /cvsroot/ijbswa/current/standard.action,v $
 # 
-#  $Id: standard.action,v 1.8 2006/08/03 02:46:41 david__schmidt Exp $
+#  $Id: standard.action,v 1.21 2007/09/01 11:06:04 fabiankeil Exp $
 #
 #  Purpose     :  Provide prefedined sets of actions, see
 #                 http://www.privoxy.org/user-manual/actions-file.html
 #
-#  Copyright   :  Written by and Copyright 2002-2006
+#  Copyright   :  Written by and Copyright 2002-2007
 #                 Privoxy team. http://www.privoxy.org/
 #
 ######################################################################
@@ -18,7 +18,7 @@
 #
 #          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
+#          user.action and/or user.filter. Or use the custom editor at
 #          http://p.p/. Thanks.
 #
 ######################################################################
@@ -28,61 +28,9 @@
 # Cautious settings -- safe for all sites, but offer little privacy protection
 #
 { \
--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-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 \
 }
 standard.Cautious
 
@@ -91,123 +39,57 @@ standard.Cautious
 # Medium settings -- safe for most sites, with reasonable protection/damage tradeoff
 #
 { \
--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-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-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 \
++hide-referrer{conditional-block} \
 +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} \
--block \
--content-type-overwrite \
--crunch-client-header \
--crunch-if-none-match \
++client-header-tagger{css-requests} \
++client-header-tagger{image-requests} \
++crunch-if-none-match \
 +crunch-outgoing-cookies \
 +crunch-incoming-cookies \
--crunch-server-header \
 +deanimate-gifs{last} \
--downgrade-http-version \
 +fast-redirects{check-decoded-url} \
-+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-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-if-modified-since{-60} \
 +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 \
++hide-referrer{conditional-block} \
++limit-connect{,} \
++overwrite-last-modified{randomize} \
 +set-image-blocker{pattern} \
--treat-forbidden-connects-like-blocks \
++treat-forbidden-connects-like-blocks \
 }
-standard.Adventuresome
+standard.Advanced