Remove kill-popups action.

[privoxy.git] / actions.c

diff --git a/actions.c b/actions.c
index b4904c9..4257acc 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -1,4 +1,4 @@
-const char actions_rcs[] = "$Id: actions.c,v 1.44 2008/03/04 18:30:34 fabiankeil Exp $";
+const char actions_rcs[] = "$Id: actions.c,v 1.45 2008/03/24 11:21:02 fabiankeil Exp $";

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/actions.c,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/actions.c,v $


@@ -33,6 +33,11 @@ const char actions_rcs[] = "$Id: actions.c,v 1.44 2008/03/04 18:30:34 fabiankeil
  *
  * Revisions   :
  *    $Log: actions.c,v $
  *
  * Revisions   :
  *    $Log: actions.c,v $

+ *    Revision 1.45  2008/03/24 11:21:02  fabiankeil
+ *    Share the action settings for multiple patterns in the same
+ *    section so we waste less memory for gigantic block lists
+ *    (and load them slightly faster). Reported by Franz Schwartau.
+ *

  *    Revision 1.44  2008/03/04 18:30:34  fabiankeil
  *    Remove the treat-forbidden-connects-like-blocks action. We now
  *    use the "blocked" page for forbidden CONNECT requests by default.
  *    Revision 1.44  2008/03/04 18:30:34  fabiankeil
  *    Remove the treat-forbidden-connects-like-blocks action. We now
  *    use the "blocked" page for forbidden CONNECT requests by default.


@@ -643,7 +648,8 @@ jb_err get_action_token(char **line, char **name, char **value)
  *********************************************************************/
 static int action_used_to_be_valid(const char *action)
 {
  *********************************************************************/
 static int action_used_to_be_valid(const char *action)
 {

-   return (0 == strcmpic(action, "treat-forbidden-connects-like-blocks"));
+   return (0 == strcmpic(action, "treat-forbidden-connects-like-blocks")
+        || 0 == strcmpic(action, "kill-popups"));

 }
 
 /*********************************************************************
 }
 
 /*********************************************************************