From c572a51fac46f778905533d0e0fc8cafc1008a65 Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Wed, 21 May 2008 15:35:08 +0000
Subject: [PATCH] - Mark csp as immutable for block_acl(). - Remove an obsolete
 complaint about filter_popups().

---
 filters.c | 13 +++++--------
 filters.h | 10 ++++++++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/filters.c b/filters.c
index b7a1ff85..8ba1b40c 100644
--- a/filters.c
+++ b/filters.c
@@ -1,4 +1,4 @@
-const char filters_rcs[] = "$Id: filters.c,v 1.106 2008/05/03 16:40:44 fabiankeil Exp $";
+const char filters_rcs[] = "$Id: filters.c,v 1.107 2008/05/04 17:52:56 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/filters.c,v $
@@ -40,6 +40,9 @@ const char filters_rcs[] = "$Id: filters.c,v 1.106 2008/05/03 16:40:44 fabiankei
  *
  * Revisions   :
  *    $Log: filters.c,v $
+ *    Revision 1.107  2008/05/04 17:52:56  fabiankeil
+ *    Adjust parse_http_url() call to new prototype.
+ *
  *    Revision 1.106  2008/05/03 16:40:44  fabiankeil
  *    Change content_filters_enabled()'s parameter from
  *    csp->action to action so it can be also used in the
@@ -703,7 +706,7 @@ static jb_err prepare_for_filtering(struct client_state *csp);
  * Returns     : 0 = FALSE (don't block) and 1 = TRUE (do block)
  *
  *********************************************************************/
-int block_acl(struct access_control_addr *dst, struct client_state *csp)
+int block_acl(const struct access_control_addr *dst, const struct client_state *csp)
 {
    struct access_control_list *acl = csp->config->acl;
 
@@ -2076,12 +2079,6 @@ static char *gif_deanimate_response(struct client_state *csp)
  * Description :  Decides which content filter function has
  *                to be applied (if any).
  *
- *                XXX: Doesn't handle filter_popups()
- *                because of the different prototype. Probably
- *                we should ditch filter_popups() anyway, it's
- *                even less reliable than popup blocking based
- *                on pcrs filters.
- *
  * Parameters  :
  *          1  :  csp = Current client state (buffers, headers, etc...)
  *
diff --git a/filters.h b/filters.h
index 6a68d9a2..836cfa53 100644
--- a/filters.h
+++ b/filters.h
@@ -1,6 +1,6 @@
 #ifndef FILTERS_H_INCLUDED
 #define FILTERS_H_INCLUDED
-#define FILTERS_H_VERSION "$Id: filters.h,v 1.34 2008/03/02 12:25:25 fabiankeil Exp $"
+#define FILTERS_H_VERSION "$Id: filters.h,v 1.35 2008/05/03 16:40:45 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/filters.h,v $
@@ -39,6 +39,12 @@
  *
  * Revisions   :
  *    $Log: filters.h,v $
+ *    Revision 1.35  2008/05/03 16:40:45  fabiankeil
+ *    Change content_filters_enabled()'s parameter from
+ *    csp->action to action so it can be also used in the
+ *    CGI code. Don't bother checking if there are filters
+ *    loaded, as that's somewhat besides the point.
+ *
  *    Revision 1.34  2008/03/02 12:25:25  fabiankeil
  *    Also use shiny new connect_port_is_forbidden() in jcc.c.
  *
@@ -286,7 +292,7 @@ struct url_spec;
  * ACL checking
  */
 #ifdef FEATURE_ACL
-extern int block_acl(struct access_control_addr *dst, struct client_state *csp);
+extern int block_acl(const struct access_control_addr *dst, const struct client_state *csp);
 extern int acl_addr(const char *aspec, struct access_control_addr *aca);
 #endif /* def FEATURE_ACL */
 
-- 
2.39.2