aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Hofmann <Johannes.Hofmann@gmx.de>2010-08-25 13:05:12 +0200
committerJohannes Hofmann <Johannes.Hofmann@gmx.de>2010-08-25 13:05:12 +0200
commit250b1d411381c4cfdbfeb1861c78c7f88d1fb1f2 (patch)
tree2f3da1812c8ce46f50de1a7acb456b82a236e626
parent62be9dbb1622b3f01745bb6d6df2ea2e1f715965 (diff)
parent0c0fcf9480f846c8c116e1e5941af7bfa7944e7f (diff)
merge
-rw-r--r--src/capi.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/capi.c b/src/capi.c
index 3df48628..ef97461e 100644
--- a/src/capi.c
+++ b/src/capi.c
@@ -363,8 +363,8 @@ static void Capi_dpi_send_source(BrowserWindow *bw, DilloUrl *url)
* 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 @@ static bool_t Capi_filters_allow(const DilloUrl *wanted,
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 a_Capi_open_url(DilloWeb *web, CA_Callback_t Call, void *CbData)
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) ||