Hopiu/linkchecker
1
0
Fork 0
mirror of https://github.com/Hopiu/linkchecker.git synced 2026-04-19 13:51:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reflect changes in httplib2.py: use buffered read in httplib response object and use bad status line exception attribute.

Browse source
This commit is contained in:
Bastian Kleineidam 2010-03-26 20:50:38 +01:00
parent 6650b4a45e
commit 3370ea1562
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
linkcheck/checker/httpurl.py
View file

@ -214,10 +214,10 @@ Use URL `%(newurl)s' instead for checking.""") % {
response.close()
try:
response = self._try_http_response()
except httplib.BadStatusLine:
except httplib.BadStatusLine, msg:
# some servers send empty HEAD replies
if self.method == "HEAD":
log.debug(LOG_CHECK, "Empty status line: falling back to GET")
log.debug(LOG_CHECK, "Bad status line %r: falling back to GET", msg)
self.method = "GET"
self.aliases = []
self.fallback_get = True
@ -247,10 +247,10 @@ Use URL `%(newurl)s' instead for checking.""") % {
self.proxy, self.proxyauth = oldproxy
try:
tries, response = self.follow_redirections(response)
except httplib.BadStatusLine:
except httplib.BadStatusLine, msg:
# some servers send empty HEAD replies
if self.method == "HEAD":
log.debug(LOG_CHECK, "Empty status line: falling back to GET")
log.debug(LOG_CHECK, "Bad status line %r: falling back to GET", msg)
self.method = "GET"
self.aliases = []
self.fallback_get = True
@ -455,7 +455,7 @@ Use URL `%(newurl)s' instead for checking.""") % {
return self._get_http_response()
raise
except httplib.BadStatusLine, msg:
if str(msg) == "Empty status line" and self.reused_connection:
if not msg and self.reused_connection:
# server closed connection - retry
log.debug(LOG_CHECK, "Empty status line: retry")
self.persistent = False
@ -515,7 +515,7 @@ Use URL `%(newurl)s' instead for checking.""") % {
value = c.client_header_value()
self.url_connection.putheader(name, value)
self.url_connection.endheaders()
response = self.url_connection.getresponse()
response = self.url_connection.getresponse(True)
self.timeout = headers.http_timeout(response)
self.headers = response.msg
self.persistent = not response.will_close

3
linkcheck/checker/urlbase.py
View file

@ -90,7 +90,6 @@ class UrlBase (object):
self.reset()
self.check_syntax()
def init (self, base_ref, base_url, parent_url, recursion_level,
aggregate, line, column, name, url_encoding):
"""
@ -794,7 +793,7 @@ class UrlBase (object):
h.putheader('Content-Length', str(len(body)))
h.endheaders()
h.send(body)
r = h.getresponse()
r = h.getresponse(True)
if r.getheader('X-W3C-Validator-Status', 'Invalid') == 'Valid':
self.add_info(u"W3C Validator: %s" % _("valid CSS syntax"))
return