Renamed prevent-(setting/reading)-cookies to crunch-(incoming/outgoing)-cookies

diff --git a/actionlist.h b/actionlist.h
index 53c3639..34b824b 100644 (file)
--- a/actionlist.h
+++ b/actionlist.h
@@ -39,6 +39,9 @@
  *
  * Revisions   :
  *    $Log: actionlist.h,v $
  *
  * Revisions   :
  *    $Log: actionlist.h,v $

+ *    Revision 1.16  2002/04/24 02:15:18  oes
+ *    Renamed actions as discussed, Aliased old action names to new ones.
+ *

  *    Revision 1.15  2002/03/26 22:29:54  swa
  *    we have a new homepage!
  *
  *    Revision 1.15  2002/03/26 22:29:54  swa
  *    we have a new homepage!
  *


@@ -99,12 +102,15 @@
 
 DEFINE_ACTION_MULTI      ("add-header",                 ACTION_MULTI_ADD_HEADER)
 DEFINE_ACTION_BOOL       ("block",                      ACTION_BLOCK)
 
 DEFINE_ACTION_MULTI      ("add-header",                 ACTION_MULTI_ADD_HEADER)
 DEFINE_ACTION_BOOL       ("block",                      ACTION_BLOCK)

+DEFINE_ACTION_BOOL       ("crunch-incoming-cookies",    ACTION_NO_COOKIE_SET)
+DEFINE_ACTION_BOOL       ("crunch-outgoing-cookies",    ACTION_NO_COOKIE_READ)

 DEFINE_ACTION_STRING     ("deanimate-gifs",             ACTION_DEANIMATE,       ACTION_STRING_DEANIMATE)
 DEFINE_CGI_PARAM_RADIO   ("deanimate-gifs",             ACTION_DEANIMATE,       ACTION_STRING_DEANIMATE,     "first", 0)
 DEFINE_CGI_PARAM_RADIO   ("deanimate-gifs",             ACTION_DEANIMATE,       ACTION_STRING_DEANIMATE,     "last",  1)
 DEFINE_ACTION_BOOL       ("downgrade-http-version",     ACTION_DOWNGRADE)
 DEFINE_ACTION_BOOL       ("fast-redirects",             ACTION_FAST_REDIRECTS)
 DEFINE_ACTION_MULTI      ("filter",                     ACTION_MULTI_FILTER)
 DEFINE_ACTION_STRING     ("deanimate-gifs",             ACTION_DEANIMATE,       ACTION_STRING_DEANIMATE)
 DEFINE_CGI_PARAM_RADIO   ("deanimate-gifs",             ACTION_DEANIMATE,       ACTION_STRING_DEANIMATE,     "first", 0)
 DEFINE_CGI_PARAM_RADIO   ("deanimate-gifs",             ACTION_DEANIMATE,       ACTION_STRING_DEANIMATE,     "last",  1)
 DEFINE_ACTION_BOOL       ("downgrade-http-version",     ACTION_DOWNGRADE)
 DEFINE_ACTION_BOOL       ("fast-redirects",             ACTION_FAST_REDIRECTS)
 DEFINE_ACTION_MULTI      ("filter",                     ACTION_MULTI_FILTER)

+DEFINE_ACTION_BOOL       ("handle-as-image",            ACTION_IMAGE)

 DEFINE_ACTION_BOOL       ("hide-forwarded-for-headers", ACTION_HIDE_FORWARDED)
 DEFINE_ACTION_STRING     ("hide-from-header",           ACTION_HIDE_FROM,       ACTION_STRING_FROM)
 DEFINE_CGI_PARAM_RADIO   ("hide-from-header",           ACTION_HIDE_FROM,       ACTION_STRING_FROM,          "block", 1)
 DEFINE_ACTION_BOOL       ("hide-forwarded-for-headers", ACTION_HIDE_FORWARDED)
 DEFINE_ACTION_STRING     ("hide-from-header",           ACTION_HIDE_FROM,       ACTION_STRING_FROM)
 DEFINE_CGI_PARAM_RADIO   ("hide-from-header",           ACTION_HIDE_FROM,       ACTION_STRING_FROM,          "block", 1)


@@ -115,20 +121,18 @@ DEFINE_CGI_PARAM_RADIO   ("hide-referer",               ACTION_HIDE_REFERER,
 DEFINE_CGI_PARAM_CUSTOM  ("hide-referer",               ACTION_HIDE_REFERER,    ACTION_STRING_REFERER,       "http://www.google.com/")
 DEFINE_ACTION_STRING     ("hide-user-agent",            ACTION_HIDE_USER_AGENT, ACTION_STRING_USER_AGENT)
 DEFINE_CGI_PARAM_NO_RADIO("hide-user-agent",            ACTION_HIDE_USER_AGENT, ACTION_STRING_USER_AGENT,    "Privoxy/3.0 (Anonymous)")
 DEFINE_CGI_PARAM_CUSTOM  ("hide-referer",               ACTION_HIDE_REFERER,    ACTION_STRING_REFERER,       "http://www.google.com/")
 DEFINE_ACTION_STRING     ("hide-user-agent",            ACTION_HIDE_USER_AGENT, ACTION_STRING_USER_AGENT)
 DEFINE_CGI_PARAM_NO_RADIO("hide-user-agent",            ACTION_HIDE_USER_AGENT, ACTION_STRING_USER_AGENT,    "Privoxy/3.0 (Anonymous)")

-DEFINE_ACTION_BOOL       ("handle-as-image",            ACTION_IMAGE)
-DEFINE_ACTION_STRING     ("set-image-blocker",          ACTION_IMAGE_BLOCKER,   ACTION_STRING_IMAGE_BLOCKER)
-DEFINE_CGI_PARAM_RADIO   ("set-image-blocker",          ACTION_IMAGE_BLOCKER,   ACTION_STRING_IMAGE_BLOCKER, "pattern", 1)
-DEFINE_CGI_PARAM_RADIO   ("set-image-blocker",          ACTION_IMAGE_BLOCKER,   ACTION_STRING_IMAGE_BLOCKER, "blank", 0)
-DEFINE_CGI_PARAM_CUSTOM  ("set-image-blocker",          ACTION_IMAGE_BLOCKER,   ACTION_STRING_IMAGE_BLOCKER,  CGI_PREFIX "show-banner?type=pattern")
+DEFINE_ACTION_BOOL       ("kill-popups",                ACTION_NO_POPUPS)

 DEFINE_ACTION_STRING     ("limit-connect",              ACTION_LIMIT_CONNECT,   ACTION_STRING_LIMIT_CONNECT)
 DEFINE_CGI_PARAM_NO_RADIO("limit-connect",              ACTION_LIMIT_CONNECT,   ACTION_STRING_LIMIT_CONNECT,  "443")
 DEFINE_ACTION_BOOL       ("prevent-compression",        ACTION_NO_COMPRESSION)
 DEFINE_ACTION_STRING     ("limit-connect",              ACTION_LIMIT_CONNECT,   ACTION_STRING_LIMIT_CONNECT)
 DEFINE_CGI_PARAM_NO_RADIO("limit-connect",              ACTION_LIMIT_CONNECT,   ACTION_STRING_LIMIT_CONNECT,  "443")
 DEFINE_ACTION_BOOL       ("prevent-compression",        ACTION_NO_COMPRESSION)

-DEFINE_ACTION_BOOL       ("session-cookies-only",       ACTION_NO_COOKIE_KEEP)
-DEFINE_ACTION_BOOL       ("prevent-reading-cookies",    ACTION_NO_COOKIE_READ)
-DEFINE_ACTION_BOOL       ("prevent-setting-cookies",    ACTION_NO_COOKIE_SET)
-DEFINE_ACTION_BOOL       ("kill-popups",                ACTION_NO_POPUPS)

 DEFINE_ACTION_BOOL       ("send-vanilla-wafer",         ACTION_VANILLA_WAFER)
 DEFINE_ACTION_MULTI      ("send-wafer",                 ACTION_MULTI_WAFER)
 DEFINE_ACTION_BOOL       ("send-vanilla-wafer",         ACTION_VANILLA_WAFER)
 DEFINE_ACTION_MULTI      ("send-wafer",                 ACTION_MULTI_WAFER)

+DEFINE_ACTION_BOOL       ("session-cookies-only",       ACTION_NO_COOKIE_KEEP)
+DEFINE_ACTION_STRING     ("set-image-blocker",          ACTION_IMAGE_BLOCKER,   ACTION_STRING_IMAGE_BLOCKER)
+DEFINE_CGI_PARAM_RADIO   ("set-image-blocker",          ACTION_IMAGE_BLOCKER,   ACTION_STRING_IMAGE_BLOCKER, "pattern", 1)
+DEFINE_CGI_PARAM_RADIO   ("set-image-blocker",          ACTION_IMAGE_BLOCKER,   ACTION_STRING_IMAGE_BLOCKER, "blank", 0)
+DEFINE_CGI_PARAM_CUSTOM  ("set-image-blocker",          ACTION_IMAGE_BLOCKER,   ACTION_STRING_IMAGE_BLOCKER,  CGI_PREFIX "show-banner?type=pattern")
+

 
 #if DEFINE_ACTION_ALIAS
 
 
 #if DEFINE_ACTION_ALIAS
 


@@ -142,16 +146,18 @@ DEFINE_ACTION_BOOL       ("prevent-keeping-cookies", ACTION_NO_COOKIE_KEEP)
 /* 
  * Pre-3.0 compatibility
  */
 /* 
  * Pre-3.0 compatibility
  */

-DEFINE_ACTION_BOOL       ("downgrade",       ACTION_DOWNGRADE)
-DEFINE_ACTION_BOOL       ("hide-forwarded",  ACTION_HIDE_FORWARDED)
-DEFINE_ACTION_STRING     ("hide-from",       ACTION_HIDE_FROM,       ACTION_STRING_FROM)
-DEFINE_ACTION_BOOL       ("image",           ACTION_IMAGE)
-DEFINE_ACTION_STRING     ("image-blocker",   ACTION_IMAGE_BLOCKER,   ACTION_STRING_IMAGE_BLOCKER)
-DEFINE_ACTION_BOOL       ("no-compression",  ACTION_NO_COMPRESSION)
-DEFINE_ACTION_BOOL       ("no-cookies-keep", ACTION_NO_COOKIE_KEEP)
-DEFINE_ACTION_BOOL       ("no-cookies-read", ACTION_NO_COOKIE_READ)
-DEFINE_ACTION_BOOL       ("no-cookies-set",  ACTION_NO_COOKIE_SET)
-DEFINE_ACTION_BOOL       ("no-popups",       ACTION_NO_POPUPS)
+DEFINE_ACTION_BOOL       ("prevent-reading-cookies", ACTION_NO_COOKIE_READ)
+DEFINE_ACTION_BOOL       ("prevent-setting-cookies", ACTION_NO_COOKIE_SET)
+DEFINE_ACTION_BOOL       ("downgrade",               ACTION_DOWNGRADE)
+DEFINE_ACTION_BOOL       ("hide-forwarded",          ACTION_HIDE_FORWARDED)
+DEFINE_ACTION_STRING     ("hide-from",               ACTION_HIDE_FROM,       ACTION_STRING_FROM)
+DEFINE_ACTION_BOOL       ("image",                   ACTION_IMAGE)
+DEFINE_ACTION_STRING     ("image-blocker",           ACTION_IMAGE_BLOCKER,   ACTION_STRING_IMAGE_BLOCKER)
+DEFINE_ACTION_BOOL       ("no-compression",          ACTION_NO_COMPRESSION)
+DEFINE_ACTION_BOOL       ("no-cookies-keep",         ACTION_NO_COOKIE_KEEP)
+DEFINE_ACTION_BOOL       ("no-cookies-read",         ACTION_NO_COOKIE_READ)
+DEFINE_ACTION_BOOL       ("no-cookies-set",          ACTION_NO_COOKIE_SET)
+DEFINE_ACTION_BOOL       ("no-popups",               ACTION_NO_POPUPS)

 #endif /* if DEFINE_ACTION_ALIAS */
 
 #undef DEFINE_ACTION_MULTI
 #endif /* if DEFINE_ACTION_ALIAS */
 
 #undef DEFINE_ACTION_MULTI

diff --git a/standard.action b/standard.action
index a020fb2..7d5fd99 100644 (file)
--- a/standard.action
+++ b/standard.action
@@ -1,8 +1,8 @@
 ######################################################################
 # 
 ######################################################################
 # 

-#  File        :  $Source: /cvsroot/ijbswa/current/default.action,v $
+#  File        :  $Source: /cvsroot/ijbswa/current/standard.action,v $

 # 
 # 

-#  $Id: default.action,v 1.20 2002/04/21 05:50:10 swa Exp $
+#  $Id: standard.action,v 1.1 2002/04/24 02:20:49 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


@@ -53,8 +53,8 @@
 -limit-connect \
 +prevent-compression \
 -session-cookies-only \
 -limit-connect \
 +prevent-compression \
 -session-cookies-only \

--prevent-reading-cookies \
--prevent-setting-cookies \
+-crunch-outgoing-cookies \
+-crunch-incoming-cookies \

 -kill-popups \
 -send-vanilla-wafer \
 -send-wafer \
 -kill-popups \
 -send-vanilla-wafer \
 -send-wafer \


@@ -91,8 +91,8 @@ standard.Cautious
 -limit-connect \
 +prevent-compression \
 +session-cookies-only \
 -limit-connect \
 +prevent-compression \
 +session-cookies-only \

--prevent-reading-cookies \
--prevent-setting-cookies \
+-crunch-outgoing-cookies \
+-crunch-incoming-cookies \

 -kill-popups \
 -send-vanilla-wafer \
 -send-wafer \
 -kill-popups \
 -send-vanilla-wafer \
 -send-wafer \


@@ -129,8 +129,8 @@ standard.Medium
 -limit-connect \
 +prevent-compression \
 +session-cookies-only \
 -limit-connect \
 +prevent-compression \
 +session-cookies-only \

--prevent-reading-cookies \
--prevent-setting-cookies \
+-crunch-outgoing-cookies \
+-crunch-incoming-cookies \

 -kill-popups \
 -send-vanilla-wafer \
 -send-wafer \
 -kill-popups \
 -send-vanilla-wafer \
 -send-wafer \