Mercurial > public > mercurial-scm > hg
diff mercurial/wireprotoserver.py @ 36857:da4e2f87167d
hgweb: expose input stream on parsed WSGI request object
Our next step towards moving away from wsgirequest to our newer,
friendlier parsedrequest type is input stream access.
This commit exposes the input stream on the instance. Consumers
in the HTTP protocol server switch to it.
Because there were very few consumers of the input stream, we stopped
storing a reference to the input stream on wsgirequest directly. All
access now goes through parsedrequest. However, wsgirequest still
may read from this stream as part of cgi.parse(). So we still need to
create the stream from wsgirequest.
Differential Revision: https://phab.mercurial-scm.org/D2771
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Sat, 10 Mar 2018 11:06:13 -0800 |
| parents | 2cdf47e14c30 |
| children | a88d68dc3ee8 |
line wrap: on
line diff
--- a/mercurial/wireprotoserver.py Sat Mar 10 10:56:10 2018 -0800 +++ b/mercurial/wireprotoserver.py Sat Mar 10 11:06:13 2018 -0800 @@ -83,7 +83,7 @@ postlen = int(self._req.headers.get(b'X-HgArgs-Post', 0)) if postlen: args.update(urlreq.parseqs( - self._wsgireq.inp.read(postlen), keep_blank_values=True)) + self._req.bodyfh.read(postlen), keep_blank_values=True)) return args argvalue = decodevaluefromheaders(self._req, b'X-HgArg') @@ -97,7 +97,7 @@ # If httppostargs is used, we need to read Content-Length # minus the amount that was consumed by args. length -= int(self._req.headers.get(b'X-HgArgs-Post', 0)) - for s in util.filechunkiter(self._wsgireq.inp, limit=length): + for s in util.filechunkiter(self._req.bodyfh, limit=length): fp.write(s) @contextlib.contextmanager