comparison mercurial/hgweb/hgweb_mod.py @ 14999:f6a737357195

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 01 Aug 2011 10:54:34 -0500
parents 6ee6ecf1ee89 4f39610996fa
children 525fdb738975
comparison
equal deleted inserted replaced
14995:8d928799dab5 14999:f6a737357195
127 return protocol.call(self.repo, req, cmd) 127 return protocol.call(self.repo, req, cmd)
128 except ErrorResponse, inst: 128 except ErrorResponse, inst:
129 # A client that sends unbundle without 100-continue will 129 # A client that sends unbundle without 100-continue will
130 # break if we respond early. 130 # break if we respond early.
131 if (cmd == 'unbundle' and 131 if (cmd == 'unbundle' and
132 req.env.get('HTTP_EXPECT', 132 (req.env.get('HTTP_EXPECT',
133 '').lower() != '100-continue'): 133 '').lower() != '100-continue') or
134 req.env.get('X-HgHttp2', '')):
134 req.drain() 135 req.drain()
135 req.respond(inst, protocol.HGTYPE) 136 req.respond(inst, protocol.HGTYPE)
136 return '0\n%s\n' % inst.message 137 return '0\n%s\n' % inst.message
137 138
138 # translate user-visible url structure to internal structure 139 # translate user-visible url structure to internal structure