X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=standard.action;h=a02ff24c4d671af32b7fedcede6a0d1d177b4b1a;hp=7d5fd9909973b60d5f233c15ef7734f82cfea71b;hb=b2f697fb80d71f3c63af71f3cba0ab233aeafe4d;hpb=5b8478a9a4e1ea4515db998edd21a9600b278422

diff --git a/standard.action b/standard.action
index 7d5fd990..a02ff24c 100644
--- a/standard.action
+++ b/standard.action
@@ -2,137 +2,94 @@
 # 
 #  File        :  $Source: /cvsroot/ijbswa/current/standard.action,v $
 # 
-#  $Id: standard.action,v 1.1 2002/04/24 02:20:49 oes 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/faq/questions.html#CONFIGFILES
+#                 http://www.privoxy.org/user-manual/actions-file.html
 #
-#  Copyright   :  Written by and Copyright
+#  Copyright   :  Written by and Copyright 2002-2007
 #                 Privoxy team. http://www.privoxy.org/
 #
 ######################################################################
 
 ######################################################################
 #
-# CAUTION: MODYFING THIS FILE IS *NOT* RECOMMENDED for the average
-#          user.
+# 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 additions in 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.
 #
 ######################################################################
 
 ################
 #
-# Cautions settings -- safe for all sites
+# Cautious settings -- safe for all sites, but offer little privacy protection
 #
 { \
--add-header \
--block \
--deanimate-gifs \
--downgrade-http-version \
--fast-redirects \
-+filter{html-annoyances} \
-+filter{js-annoyances} \
--filter{content-cookies} \
--filter{popups} \
-+filter{webbugs} \
--filter{refresh-tags} \
--filter{fun} \
-+filter{nimda} \
-+filter{banners-by-size} \
--filter{shockwave-flash} \
--filter{crude-prental} \
 +hide-forwarded-for-headers \
 +hide-from-header{block} \
--hide-referrer \
--hide-user-agent \
--handle-as-image \
 +set-image-blocker{pattern} \
--limit-connect \
-+prevent-compression \
--session-cookies-only \
--crunch-outgoing-cookies \
--crunch-incoming-cookies \
--kill-popups \
--send-vanilla-wafer \
--send-wafer \
 }
 standard.Cautious
 
 ################
 #
-# Medium settings -- safe for most sites
+# Medium settings -- safe for most sites, with reasonable protection/damage tradeoff
 #
 { \
--add-header \
--block \
 +deanimate-gifs{last} \
--downgrade-http-version \
--fast-redirects \
-+filter{html-annoyances} \
-+filter{js-annoyances} \
-+filter{content-cookies} \
--filter{popups} \
-+filter{webbugs} \
 +filter{refresh-tags} \
--filter{fun} \
-+filter{nimda} \
++filter{img-reorder} \
 +filter{banners-by-size} \
--filter{shockwave-flash} \
--filter{crude-prental} \
++filter{webbugs} \
++filter{jumping-windows} \
++filter{ie-exploits} \
 +hide-forwarded-for-headers \
 +hide-from-header{block} \
-+hide-referrer{forge} \
--hide-user-agent \
--handle-as-image \
-+set-image-blocker{pattern} \
--limit-connect \
-+prevent-compression \
++hide-referrer{conditional-block} \
 +session-cookies-only \
--crunch-outgoing-cookies \
--crunch-incoming-cookies \
--kill-popups \
--send-vanilla-wafer \
--send-wafer \
++set-image-blocker{pattern} \
 }
 standard.Medium
 
 ################
 #
-# Advanced settings -- fun but risky
+# 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 \
++client-header-tagger{css-requests} \
++client-header-tagger{image-requests} \
++crunch-if-none-match \
++crunch-outgoing-cookies \
++crunch-incoming-cookies \
 +deanimate-gifs{last} \
--downgrade-http-version \
-+fast-redirects \
++fast-redirects{check-decoded-url} \
 +filter{html-annoyances} \
-+filter{js-annoyances} \
 +filter{content-cookies} \
-+filter{popups} \
-+filter{webbugs} \
 +filter{refresh-tags} \
-+filter{fun} \
-+filter{nimda} \
++filter{img-reorder} \
 +filter{banners-by-size} \
--filter{shockwave-flash} \
--filter{crude-prental} \
++filter{banners-by-link} \
++filter{webbugs} \
++filter{jumping-windows} \
++filter{frameset-borders} \
++filter{quicktime-kioskmode} \
++hide-if-modified-since{-60} \
 +hide-forwarded-for-headers \
 +hide-from-header{block} \
-+hide-referrer{forge} \
--hide-user-agent \
--handle-as-image \
++hide-referrer{conditional-block} \
++limit-connect{,} \
++overwrite-last-modified{randomize} \
 +set-image-blocker{pattern} \
--limit-connect \
-+prevent-compression \
-+session-cookies-only \
--crunch-outgoing-cookies \
--crunch-incoming-cookies \
--kill-popups \
--send-vanilla-wafer \
--send-wafer \
++treat-forbidden-connects-like-blocks \
 }
 standard.Advanced