From 5425d6324eef961e375ef4109445bdce8dba5f6c Mon Sep 17 00:00:00 2001 From: corvid Date: Tue, 27 Apr 2010 01:03:27 +0000 Subject: back out cef38874b78f Surprising that it took a week for me to notice anything was wrong. --- src/cache.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/cache.c') diff --git a/src/cache.c b/src/cache.c index ec6ccf14..fcd27a05 100644 --- a/src/cache.c +++ b/src/cache.c @@ -936,16 +936,20 @@ static int Cache_redirect(CacheEntry_t *entry, int Flags, BrowserWindow *bw) URL_STR_(entry->Url), URL_STR_(entry->Location)); _MSG("%s", entry->Header->str); - if ((Flags & WEB_RootUrl) || - (prefs.filter_auto_requests == PREFS_FILTER_SAME_DOMAIN)) { - /* Follow redirection for the main page unconditionally. For images - * and stylesheets, follow if the request will go through filtering. - */ + if (Flags & WEB_RootUrl) { + /* Redirection of the main page */ NewUrl = a_Url_new(URL_STR_(entry->Location), URL_STR_(entry->Url)); if (entry->Flags & CA_TempRedirect) a_Url_set_flags(NewUrl, URL_FLAGS(NewUrl) | URL_E2EQuery); a_Nav_push(bw, NewUrl, entry->Url); a_Url_free(NewUrl); + } else { + /* Sub entity redirection (most probably an image) */ + if (!entry->Data->len) { + _MSG(">>>Image redirection without entity-content<<<\n"); + } else { + _MSG(">>>Image redirection with entity-content<<<\n"); + } } } return 0; -- cgit v1.2.3