D3356: wsgicgi: un-do some prior porting work that is now wrong
durin42 (Augie Fackler)
phabricator at mercurial-scm.org
Mon Apr 16 16:17:35 EDT 2018
durin42 updated this revision to Diff 8315.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3356?vs=8271&id=8315
REVISION DETAIL
https://phab.mercurial-scm.org/D3356
AFFECTED FILES
contrib/python3-whitelist
mercurial/hgweb/wsgicgi.py
CHANGE DETAILS
diff --git a/mercurial/hgweb/wsgicgi.py b/mercurial/hgweb/wsgicgi.py
--- a/mercurial/hgweb/wsgicgi.py
+++ b/mercurial/hgweb/wsgicgi.py
@@ -10,8 +10,10 @@
from __future__ import absolute_import
+import os
+
from .. import (
- encoding,
+ pycompat,
)
from ..utils import (
@@ -26,7 +28,7 @@
procutil.setbinary(procutil.stdin)
procutil.setbinary(procutil.stdout)
- environ = dict(encoding.environ.iteritems())
+ environ = dict(os.environ.iteritems()) # re-exports
environ.setdefault(r'PATH_INFO', '')
if environ.get(r'SERVER_SOFTWARE', r'').startswith(r'Microsoft-IIS'):
# IIS includes script_name in PATH_INFO
@@ -61,9 +63,10 @@
elif not headers_sent:
# Before the first output, send the stored headers
status, response_headers = headers_sent[:] = headers_set
- out.write('Status: %s\r\n' % status)
- for header in response_headers:
- out.write('%s: %s\r\n' % header)
+ out.write('Status: %s\r\n' % pycompat.bytesurl(status))
+ for hk, hv in response_headers:
+ out.write('%s: %s\r\n' % (pycompat.bytesurl(hk),
+ pycompat.bytesurl(hv)))
out.write('\r\n')
out.write(data)
diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist
--- a/contrib/python3-whitelist
+++ b/contrib/python3-whitelist
@@ -45,6 +45,7 @@
test-check-pylint.t
test-check-shbang.t
test-children.t
+test-clone-cgi.t
test-clone-pull-corruption.t
test-clone-r.t
test-clone-update-order.t
To: durin42, pulkit, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list