Copying from 3.0 branch

diff --git a/standard.action b/standard.action
index 7d5fd99..17c13c4 100644 (file)
--- a/standard.action
+++ b/standard.action
@@ -2,7 +2,7 @@
 # 
 #  File        :  $Source: /cvsroot/ijbswa/current/standard.action,v $
 # 
 # 
 #  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.2.2.2 2002/07/27 18:13:36 oes Exp $

 #
 #  Purpose     :  Provide prefedined sets of actions, see
 #                 http://www.privoxy.org/faq/questions.html#CONFIGFILES
 #
 #  Purpose     :  Provide prefedined sets of actions, see
 #                 http://www.privoxy.org/faq/questions.html#CONFIGFILES


@@ -19,120 +19,129 @@
 #
 #          If you want to customize Privoxy to suit your needs, 
 #          you can alter the default section in default.action and/or
 #
 #          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
+#          add your personal exceptions and extensions to user.action

 #
 ######################################################################
 
 ################
 #
 #
 ######################################################################
 
 ################
 #

-# Cautions settings -- safe for all sites
+# Cautions settings -- safe for all sites, but offer little privacy protection

 #
 { \
 -add-header \
 -block \
 #
 { \
 -add-header \
 -block \

+-crunch-outgoing-cookies \
+-crunch-incoming-cookies \

 -deanimate-gifs \
 -downgrade-http-version \
 -fast-redirects \
 -deanimate-gifs \
 -downgrade-http-version \
 -fast-redirects \

-+filter{html-annoyances} \

 +filter{js-annoyances} \
 +filter{js-annoyances} \

--filter{content-cookies} \
--filter{popups} \
++filter{html-annoyances} \

 +filter{webbugs} \
 +filter{webbugs} \

+-filter{popups} \
+-filter{frameset-borders} \

 -filter{refresh-tags} \
 -filter{refresh-tags} \

+-filter{img-reorder} \
++filter{banners-by-size} \
+-filter{banners-by-link} \

 -filter{fun} \
 +filter{nimda} \
 -filter{fun} \
 +filter{nimda} \

-+filter{banners-by-size} \

 -filter{shockwave-flash} \
 -filter{shockwave-flash} \

--filter{crude-prental} \
+-filter{js-events} \
+-filter{crude-parental} \
+-handle-as-image \

 +hide-forwarded-for-headers \
 +hide-from-header{block} \
 -hide-referrer \
 -hide-user-agent \
 +hide-forwarded-for-headers \
 +hide-from-header{block} \
 -hide-referrer \
 -hide-user-agent \

--handle-as-image \
-+set-image-blocker{pattern} \
+-kill-popups \

 -limit-connect \
 +prevent-compression \
 -limit-connect \
 +prevent-compression \

--session-cookies-only \
--crunch-outgoing-cookies \
--crunch-incoming-cookies \
--kill-popups \

 -send-vanilla-wafer \
 -send-wafer \
 -send-vanilla-wafer \
 -send-wafer \

+-session-cookies-only \
++set-image-blocker{pattern} \

 }
 standard.Cautious
 
 ################
 #
 }
 standard.Cautious
 
 ################
 #

-# Medium settings -- safe for most sites
+# Medium settings -- safe for most sites, with reasonable protection/damage tradeoff

 #
 { \
 -add-header \
 -block \
 #
 { \
 -add-header \
 -block \

+-crunch-outgoing-cookies \
+-crunch-incoming-cookies \

 +deanimate-gifs{last} \
 -downgrade-http-version \
 -fast-redirects \
 +deanimate-gifs{last} \
 -downgrade-http-version \
 -fast-redirects \

-+filter{html-annoyances} \

 +filter{js-annoyances} \
 +filter{js-annoyances} \

-+filter{content-cookies} \
--filter{popups} \
++filter{html-annoyances} \

 +filter{webbugs} \
 +filter{webbugs} \

-+filter{refresh-tags} \
++filter{popups} \
+-filter{frameset-borders} \
+-filter{refresh-tags} \
+-filter{img-reorder} \
++filter{banners-by-size} \
+-filter{banners-by-link} \

 -filter{fun} \
 +filter{nimda} \
 -filter{fun} \
 +filter{nimda} \

-+filter{banners-by-size} \

 -filter{shockwave-flash} \
 -filter{shockwave-flash} \

--filter{crude-prental} \
+-filter{js-events} \
+-filter{crude-parental} \
+-handle-as-image \

 +hide-forwarded-for-headers \
 +hide-from-header{block} \
 +hide-referrer{forge} \
 -hide-user-agent \
 +hide-forwarded-for-headers \
 +hide-from-header{block} \
 +hide-referrer{forge} \
 -hide-user-agent \

--handle-as-image \
-+set-image-blocker{pattern} \
+-kill-popups \

 -limit-connect \
 +prevent-compression \
 -limit-connect \
 +prevent-compression \

-+session-cookies-only \
--crunch-outgoing-cookies \
--crunch-incoming-cookies \
--kill-popups \

 -send-vanilla-wafer \
 -send-wafer \
 -send-vanilla-wafer \
 -send-wafer \

++session-cookies-only \
++set-image-blocker{pattern} \

 }
 standard.Medium
 
 ################
 #
 }
 standard.Medium
 
 ################
 #

-# Advanced settings -- fun but risky
+# Advanced settings -- fun but risky (and include new filters)

 #
 { \
 +add-header{X-User-Tracking: sucks} \
 -block \
 #
 { \
 +add-header{X-User-Tracking: sucks} \
 -block \

++crunch-outgoing-cookies \
++crunch-incoming-cookies \

 +deanimate-gifs{last} \
 -downgrade-http-version \
 +fast-redirects \
 +deanimate-gifs{last} \
 -downgrade-http-version \
 +fast-redirects \

-+filter{html-annoyances} \

 +filter{js-annoyances} \
 +filter{js-annoyances} \

-+filter{content-cookies} \
-+filter{popups} \
++filter{html-annoyances} \

 +filter{webbugs} \
 +filter{webbugs} \

-+filter{refresh-tags} \
++filter{popups} \
++filter{frameset-borders} \
+-filter{refresh-tags} \
++filter{img-reorder} \
++filter{banners-by-size} \
++filter{banners-by-link} \

 +filter{fun} \
 +filter{nimda} \
 +filter{fun} \
 +filter{nimda} \

-+filter{banners-by-size} \

 -filter{shockwave-flash} \
 -filter{shockwave-flash} \

--filter{crude-prental} \
+-filter{js-events} \
+-filter{crude-parental} \
+-handle-as-image \

 +hide-forwarded-for-headers \
 +hide-from-header{block} \
 +hide-referrer{forge} \
 -hide-user-agent \
 +hide-forwarded-for-headers \
 +hide-from-header{block} \
 +hide-referrer{forge} \
 -hide-user-agent \

--handle-as-image \
-+set-image-blocker{pattern} \
+-kill-popups \

 -limit-connect \
 +prevent-compression \
 -limit-connect \
 +prevent-compression \

-+session-cookies-only \
--crunch-outgoing-cookies \
--crunch-incoming-cookies \
--kill-popups \

 -send-vanilla-wafer \
 -send-wafer \
 -send-vanilla-wafer \
 -send-wafer \

+-session-cookies-only \
++set-image-blocker{pattern} \

 }
 standard.Advanced
 }
 standard.Advanced