Mercurial > hg > mercurial-source
changeset 14138:091c86a77d19
httprepo: proper handling of invalid responses without content-type (issue2019)
This can currently be tested on http://sf.net/
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Mon, 07 Mar 2011 14:47:30 +0100 |
parents | cc9366a3751b |
children | 3a3584967a93 |
files | mercurial/httprepo.py |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/httprepo.py +++ b/mercurial/httprepo.py @@ -128,7 +128,7 @@ try: proto = resp.getheader('content-type') except AttributeError: - proto = resp.headers['content-type'] + proto = resp.headers.get('content-type', '') safeurl = util.hidepassword(self._url) # accept old "text/plain" and "application/hg-changegroup" for now @@ -139,7 +139,7 @@ raise error.RepoError( _("'%s' does not appear to be an hg repository:\n" "---%%<--- (%s)\n%s\n---%%<---\n") - % (safeurl, proto, resp.read())) + % (safeurl, proto or 'no content-type', resp.read())) if proto.startswith('application/mercurial-'): try: