This commit is contained in:
Miroslav Stampar 2015-11-22 16:05:48 +01:00
parent 376037123b
commit 4d576928a7

View File

@ -476,7 +476,7 @@ class Connect(object):
status = getUnicode(conn.msg) status = getUnicode(conn.msg)
if extractRegexResult(META_REFRESH_REGEX, page) and not refreshing: if extractRegexResult(META_REFRESH_REGEX, page) and not refreshing:
url = extractRegexResult(META_REFRESH_REGEX, page) refresh = extractRegexResult(META_REFRESH_REGEX, page)
debugMsg = "got HTML meta refresh header" debugMsg = "got HTML meta refresh header"
logger.debug(debugMsg) logger.debug(debugMsg)
@ -491,13 +491,14 @@ class Connect(object):
kb.alwaysRefresh = choice not in ("n", "N") kb.alwaysRefresh = choice not in ("n", "N")
if kb.alwaysRefresh: if kb.alwaysRefresh:
if url.lower().startswith('http://'): if re.search(r"\Ahttps?://", refresh, re.I):
kwargs['url'] = url url = refresh
else: else:
kwargs['url'] = conf.url[:conf.url.rfind('/') + 1] + url url = urlparse.urljoin(url, refresh)
threadData.lastRedirectMsg = (threadData.lastRequestUID, page) threadData.lastRedirectMsg = (threadData.lastRequestUID, page)
kwargs['refreshing'] = True kwargs['refreshing'] = True
kwargs['url'] = url
kwargs['get'] = None kwargs['get'] = None
kwargs['post'] = None kwargs['post'] = None