This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3248

hgweb: put response headers back into str for Python 3
ClosedPublic

Authored by durin42 on Apr 11 2018, 4:10 PM.

Download Raw Diff

Details

Reviewers

indygreg

Group Reviewers

hg-reviewers

Commits

rHGe320d9405bba: hgweb: put response headers back into str for Python 3

Summary

This fixes a lot of hanging tests on Python 3, because
"Content-Length" was getting sent as "b'Content-Length'" (yes, really)
and then clients would expect a close-is-end body instead of counting
off a certain number of bytes.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

durin42 created this revision.Apr 11 2018, 4:10 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptApr 11 2018, 4:10 PM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

durin42 added a child revision: D3249: wireprotoserver: headers are bytes for us internally, use bytes.Apr 11 2018, 4:10 PM

A low-level WSGI API that literally puts data on the wire uses Unicode. Because Python 3. Sadness.

This revision is now accepted and ready to land.Apr 12 2018, 11:18 AM

Closed by commit rHGe320d9405bba: hgweb: put response headers back into str for Python 3 (authored by durin42). · Explain WhyApr 12 2018, 11:34 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/hgweb/request.py (4 lines)

Status	Author	Revision
Closed	durin42	D3253 py3: whitelist another nine passing tests
Closed	durin42	D3251 tests: glob away fqdn wherever we print it
Closed	durin42	D3250 hgweb: use native strings when interfacing with stdlib headers
Closed	durin42	D3249 wireprotoserver: headers are bytes for us internally, use bytes
Closed	durin42	D3248 hgweb: put response headers back into str for Python 3
Closed	durin42	D3247 tests: load showstack in test-pull-http.t so network hangs are easier to find
Closed	durin42	D3246 keepalive: rewrite readinto() to not use read()
Closed	durin42	D2854 hgweb: use our forked wsgiheaders module instead of stdlib one
Closed	durin42	D2853 tests: add a cat of `error.log` in subrepo test
Closed	durin42	D2846 hghave: fix hardlink-whitelisted check on Python 3
Closed	durin42	D2845 hghave: fix xdiff check on Python 3
Closed	durin42	D2844 commandserver: prefer first-party selectors module from Python 3 to backport
Closed	durin42	D3245 wsgiheaders: import a bytes-ified fork of wsgiref.headers from cpython@46f5072

Diff 8012

mercurial/hgweb/request.py


	if drain:			if drain:
	assert isinstance(self._req.bodyfh, util.cappedreader)			assert isinstance(self._req.bodyfh, util.cappedreader)
	while True:			while True:
	chunk = self._req.bodyfh.read(32768)			chunk = self._req.bodyfh.read(32768)
	if not chunk:			if not chunk:
	break			break

				strheaders = [(pycompat.strurl(k), pycompat.strurl(v)) for
				k, v in self.headers.items()]
	write = self._startresponse(pycompat.sysstr(self.status),			write = self._startresponse(pycompat.sysstr(self.status),
	self.headers.items())			strheaders)

	if self._bodybytes:			if self._bodybytes:
	yield self._bodybytes			yield self._bodybytes
	elif self._bodygen:			elif self._bodygen:
	for chunk in self._bodygen:			for chunk in self._bodygen:
	yield chunk			yield chunk
	elif self._bodywillwrite:			elif self._bodywillwrite:
	self._bodywritefn = write			self._bodywritefn = write

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	8012		Apr 11 2018, 4:10 PM	★	★
Diff 2	8067	rHGe320d9405bba1cd8dcc73bf6ecac0e17785ae6c0	Apr 11 2018, 4:09 PM	★	★