Updating branch refs/heads/master
to 3f795a62cbd33eb0dcdf8b9d596d89a4b0aa72dd (commit)
from da5f257314735863f310dc4e63f0a87979c7c131 (commit)
commit 3f795a62cbd33eb0dcdf8b9d596d89a4b0aa72dd
Author: André Stösel <[email protected]>
Date: Fri Apr 13 03:02:22 2012 +0200
Ignore request if the source is a redirect and of the main frame
Fixes: https://bugs.launchpad.net/midori/+bug/979767
extensions/adblock.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/extensions/adblock.c b/extensions/adblock.c
index 0613787..2b35fa5 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -833,6 +833,15 @@ adblock_resource_request_starting_cb (WebKitWebView*
web_view,
if (!(msg && !g_strcmp0 (msg->method, "GET")))
return;
+ if (response != NULL) /* request is caused by redirect */
+ {
+ if (web_frame == webkit_web_view_get_main_frame (web_view))
+ {
+ g_hash_table_replace (navigationwhitelist, web_view, g_strdup
(req_uri));
+ return;
+ }
+ }
+
#ifdef G_ENABLE_DEBUG
if (debug == 2)
g_test_timer_start ();
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
