httppeer: improve protocol check
authorMatt Mackall <mpm@selenic.com>
Sun, 17 Feb 2013 14:34:53 -0600
changeset 18697 4921b5c2aeed
parent 18696 d23f61b6617f
child 18702 32292ad53f9f
child 18705 a8204cef4c5a
httppeer: improve protocol check Pre-0.6c hgweb used text/plain for protocol responses. This meant that a web server could serve a static file and confuse a client into generating a nasty traceback. Now we insist that text/plain protocol responses not include a Content-Length, which older hgweb didn't generate but will typically be produced for static files.
mercurial/httppeer.py
--- a/mercurial/httppeer.py	Sun Feb 17 14:41:31 2013 -0600
+++ b/mercurial/httppeer.py	Sun Feb 17 14:34:53 2013 -0600
@@ -145,7 +145,8 @@
             raise error.OutOfBandError(resp.read())
         # accept old "text/plain" and "application/hg-changegroup" for now
         if not (proto.startswith('application/mercurial-') or
-                proto.startswith('text/plain') or
+                (proto.startswith('text/plain')
+                 and not resp.headers.get('content-length')) or
                 proto.startswith('application/hg-changegroup')):
             self.ui.debug("requested URL: '%s'\n" % util.hidepassword(cu))
             raise error.RepoError(