Remove kill-popups action.

[privoxy.git] / filters.c

diff --git a/filters.c b/filters.c
index 7a223dc..b2940c1 100644 (file)
--- a/filters.c
+++ b/filters.c
@@ -1,4 +1,4 @@
-const char filters_rcs[] = "$Id: filters.c,v 1.102 2008/03/01 14:00:44 fabiankeil Exp $";
+const char filters_rcs[] = "$Id: filters.c,v 1.103 2008/03/06 16:33:45 fabiankeil Exp $";

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


@@ -40,6 +40,9 @@ const char filters_rcs[] = "$Id: filters.c,v 1.102 2008/03/01 14:00:44 fabiankei
  *
  * Revisions   :
  *    $Log: filters.c,v $
  *
  * Revisions   :
  *    $Log: filters.c,v $

+ *    Revision 1.103  2008/03/06 16:33:45  fabiankeil
+ *    If limit-connect isn't used, don't limit CONNECT requests to port 443.
+ *

  *    Revision 1.102  2008/03/01 14:00:44  fabiankeil
  *    Let the block action take the reason for the block
  *    as argument and show it on the "blocked" page.
  *    Revision 1.102  2008/03/01 14:00:44  fabiankeil
  *    Let the block action take the reason for the block
  *    as argument and show it on the "blocked" page.


@@ -2730,7 +2733,7 @@ inline int content_filters_enabled(const struct client_state *csp)
 {
    return (((csp->rlist != NULL) &&
       (!list_is_empty(csp->action->multi[ACTION_MULTI_FILTER]))) ||
 {
    return (((csp->rlist != NULL) &&
       (!list_is_empty(csp->action->multi[ACTION_MULTI_FILTER]))) ||

-      (csp->action->flags & (ACTION_DEANIMATE|ACTION_JPEG_INSPECT|ACTION_NO_POPUPS)));
+      (csp->action->flags & (ACTION_DEANIMATE|ACTION_JPEG_INSPECT)));

 }
 
 /*
 }
 
 /*