changeset 1697:6eb8f4815460

merge
author Johannes Hofmann <Johannes.Hofmann@gmx.de>
date Wed, 25 Aug 2010 13:05:12 +0200
parents fea7f14dfaff (current diff) f582fe8c2043 (diff)
children c3db126434e9
files
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/capi.c	Wed Aug 25 13:02:06 2010 +0200
+++ b/src/capi.c	Wed Aug 25 13:05:12 2010 +0200
@@ -363,8 +363,8 @@
  * For an automatic request, permission to load depends on the filter set
  * by the user.
  */ 
-static bool_t Capi_filters_allow(const DilloUrl *wanted,
-                                 const DilloUrl *requester)
+static bool_t Capi_filters_test(const DilloUrl *wanted,
+                                const DilloUrl *requester)
 {
    bool_t ret;
 
@@ -392,8 +392,8 @@
                ret = dStrcasecmp(req_suffix, want_suffix) == 0;
             }
 
-            MSG("Capi_filters_allow: from %s to %s: %s\n", req_host, want_host,
-                ret ? "ALLOWED" : "DENIED");
+            MSG("Capi_filters_test: %s from '%s' to '%s'\n",
+                ret ? "ALLOW" : "DENY", req_host, want_host);
             break;
          }
          case PREFS_FILTER_ALLOW_ALL:
@@ -422,7 +422,7 @@
    int safe = 0, ret = 0, use_cache = 0;
 
    dReturn_val_if_fail((a_Capi_get_flags(web->url) & CAPI_IsCached) ||
-                       Capi_filters_allow(web->url, web->requester), 0);
+                       Capi_filters_test(web->url, web->requester), 0);
 
    /* reload test */
    reload = (!(a_Capi_get_flags(web->url) & CAPI_IsCached) ||