From 1f7d87c6a4a45b77a5c0d1c9068765ac95ff3d7d Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Sun, 23 Oct 2011 20:48:37 +0000 Subject: [PATCH] bug fix for --code (previously redirecting codes where not considered) --- lib/request/connect.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/request/connect.py b/lib/request/connect.py index d5e989589..d8e4b8f16 100644 --- a/lib/request/connect.py +++ b/lib/request/connect.py @@ -135,7 +135,7 @@ class Connect: ignoreTimeout = kwargs.get('ignoreTimeout', kb.ignoreTimeout) refreshing = kwargs.get('refreshing', False) retrying = kwargs.get('retrying', False) - redirecting = kwargs.get('redirecting', False) + redirecting = kwargs.get('redirecting', None) crawling = kwargs.get('crawling', False) if not urlparse.urlsplit(url).netloc: @@ -309,7 +309,7 @@ class Connect: kb.alwaysRedirect = choice not in ("n", "N") kwargs['url'] = conn.redurl if kb.alwaysRedirect else conf.url - kwargs['redirecting'] = True + kwargs['redirecting'] = conn.redcode return Connect.__getPageProxy(**kwargs) # Return response object @@ -318,7 +318,7 @@ class Connect: # Get HTTP response page = conn.read() - code = conn.code + code = redirecting or conn.code responseHeaders = conn.info() responseHeaders[URI_HTTP_HEADER] = conn.geturl() page = decodePage(page, responseHeaders.get(HTTPHEADER.CONTENT_ENCODING), responseHeaders.get(HTTPHEADER.CONTENT_TYPE))