debian/midori
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Don't do pattern matching if link was matched by key

Browse source
This commit is contained in:
Alexander Butenko 2011-07-02 14:19:16 -04:00 committed by Christian Dywan
parent 3db46d2297
commit ac78646f83
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
extensions/adblock.c
View file

@ -678,8 +678,6 @@ static gboolean
adblock_is_matched (const gchar* req_uri, adblock_is_matched (const gchar* req_uri,
const gchar* page_uri) const gchar* page_uri)
{ {
gboolean foundbykey;
gboolean foundbypattern;
gchar* value; gchar* value;
if ((value = g_hash_table_lookup (urlcache, req_uri))) if ((value = g_hash_table_lookup (urlcache, req_uri)))
@ -690,9 +688,13 @@ adblock_is_matched (const gchar* req_uri,
return TRUE; return TRUE;
} }
foundbykey = adblock_is_matched_by_key (req_uri, page_uri); if (adblock_is_matched_by_key (req_uri, page_uri))
foundbypattern = adblock_is_matched_by_pattern (req_uri, page_uri); {
if (foundbykey == TRUE || foundbypattern == TRUE) g_hash_table_insert (urlcache, g_strdup (req_uri), g_strdup("1"));
return TRUE;
}
if (adblock_is_matched_by_pattern (req_uri, page_uri))
{ {
g_hash_table_insert (urlcache, g_strdup (req_uri), g_strdup("1")); g_hash_table_insert (urlcache, g_strdup (req_uri), g_strdup("1"));
return TRUE; return TRUE;