Mercurial > public > mercurial-scm > hg
diff mercurial/hgweb/request.py @ 7180:a42d27bc809d
hgweb: be sure to drain request data even in early error conditions
Thanks to Mads Kiilerich with noticing this. The hg client can only read data
after all the sent data has been read, so we have to read all the request data
even if we're not going to do anything with it (in error conditions). This
is not easy to fix in the client, because we're using Python's httplib, which
is strictly stateful. Abstracted the draining into a separate method.
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Mon, 20 Oct 2008 10:15:26 +0200 |
parents | 0dbb56e90a71 |
children | a3d7f99c23c0 |
line wrap: on
line diff
--- a/mercurial/hgweb/request.py Sun Oct 19 22:07:43 2008 +0200 +++ b/mercurial/hgweb/request.py Mon Oct 20 10:15:26 2008 +0200 @@ -7,6 +7,7 @@ # of the GNU General Public License, incorporated herein by reference. import socket, cgi, errno +from mercurial import util from common import ErrorResponse, statusmessage shortcuts = { @@ -57,6 +58,12 @@ def read(self, count=-1): return self.inp.read(count) + def drain(self): + '''need to read all data from request, httplib is half-duplex''' + length = int(self.env.get('CONTENT_LENGTH', 0)) + for s in util.filechunkiter(self.inp, limit=length): + pass + def respond(self, status, type=None, filename=None, length=0): if self._start_response is not None: