From 61138744e659e6843421a07e6c45729211356b3c Mon Sep 17 00:00:00 2001 From: Bastian Kleineidam Date: Tue, 8 May 2012 20:47:47 +0200 Subject: [PATCH] Always use GET for Zope servers. --- doc/changelog.txt | 5 +++++ linkcheck/checker/httpurl.py | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/changelog.txt b/doc/changelog.txt index e0caf726..82d9046e 100644 --- a/doc/changelog.txt +++ b/doc/changelog.txt @@ -1,5 +1,10 @@ 7.8 "" (released xx.xx.2012) +Fixes: +- checking: Always use GET for Zope servers since their HEAD support + is broken. + Closes: SF bug #3522710 + Changes: - documentation: Made the --ignore-url documentation more clear. Patch from Charles Jones. diff --git a/linkcheck/checker/httpurl.py b/linkcheck/checker/httpurl.py index e2f15ddd..28c5a1aa 100644 --- a/linkcheck/checker/httpurl.py +++ b/linkcheck/checker/httpurl.py @@ -280,8 +280,7 @@ class HttpUrl (internpaturl.InternPatternUrl, proxysupport.ProxySupport): mime = self.get_content_type() poweredby = self.getheader('X-Powered-By', u'') server = self.getheader('Server', u'') - if ((mime in ('application/octet-stream', 'text/plain') and - (poweredby.startswith('Zope') or server.startswith('Zope'))) + if (poweredby.startswith('Zope') or server.startswith('Zope') or ('ASP.NET' in poweredby and 'Microsoft-IIS' in server)): # Zope or IIS server could not get Content-Type with HEAD # see http://intermapper.com.dev4.silvertech.net/bogus.aspx