tsr/planet
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Fixed very weird bug where we would break on relative 301's, but *only* on the second attempt, i.e. only when reading the cache 301 redirect

Browse Source
This commit is contained in:
Joe Gregorio 2006-11-04 17:19:59 -05:00
parent 681eb117f8
commit b58d815a0d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
planet/httplib2/__init__.py
View File

@ -627,6 +627,12 @@ class Http:
if redirections: if redirections:
if not response.has_key('location') and response.status != 300: if not response.has_key('location') and response.status != 300:
raise RedirectMissingLocation( _("Redirected but the response is missing a Location: header.")) raise RedirectMissingLocation( _("Redirected but the response is missing a Location: header."))
# Fix-up relative redirects (which violate an RFC 2616 MUST)
if response.has_key('location'):
location = response['location']
(scheme, authority, path, query, fragment) = parse_uri(location)
if authority == None:
response['location'] = urlparse.urljoin(absolute_uri, location)
if response.status == 301 and method in ["GET", "HEAD"]: if response.status == 301 and method in ["GET", "HEAD"]:
response['-x-permanent-redirect-url'] = response['location'] response['-x-permanent-redirect-url'] = response['location']
_updateCache(headers, response, content, self.cache, cachekey) _updateCache(headers, response, content, self.cache, cachekey)
@ -635,11 +641,8 @@ class Http:
if headers.has_key('if-modified-since'): if headers.has_key('if-modified-since'):
del headers['if-modified-since'] del headers['if-modified-since']
if response.has_key('location'): if response.has_key('location'):
old_response = copy.deepcopy(response)
location = response['location'] location = response['location']
(scheme, authority, path, query, fragment) = parse_uri(location) old_response = copy.deepcopy(response)
if authority == None:
location = urlparse.urljoin(absolute_uri, location)
redirect_method = ((response.status == 303) and (method not in ["GET", "HEAD"])) and "GET" or method redirect_method = ((response.status == 303) and (method not in ["GET", "HEAD"])) and "GET" or method
(response, content) = self.request(location, redirect_method, body=body, headers = headers, redirections = redirections - 1) (response, content) = self.request(location, redirect_method, body=body, headers = headers, redirections = redirections - 1)
response.previous = old_response response.previous = old_response