##// END OF EJS Templates
hgweb: refactor the request draining code...
hgweb: refactor the request draining code The previous code for draining was only invoked in a few places in the wire protocol. Behavior wasn't consist. Furthermore, it was difficult to reason about. With us converting the input stream to a capped reader, it is now safe to always drain the input stream when its size is known because we can never overrun the input and read into the next HTTP request. The only question is "should we?" This commit changes the draining code so every request is examined. Draining now kicks in for a few requests where it wouldn't before. But I think the code is sufficiently restricted so the behavior is safe. Possibly the most dangerous part of this code is the issuing of Connection: close for POST and PUT requests that don't have a Content-Length. I don't think there are any such uses in our WSGI application, so this should be safe. In the near future, I plan to significantly refactor the WSGI response handling. I anticipate this code evolving a bit. So any minor regressions around draining or connection closing behavior might be fixed as a result of that work. All tests pass with this change. That scares me a bit because it means we are lacking low-level tests for the HTTP protocol. Differential Revision: https://phab.mercurial-scm.org/D2769

File last commit:

r34646:75979c8d default
r36871:2cdf47e1 default
Show More
rcutil.py
98 lines | 3.1 KiB | text/x-python | PythonLexer
Jun Wu
rcutil: move scmutil.*rcpath to rcutil (API)...
r31679 # rcutil.py - utilities about config paths, special config sections etc.
#
# Copyright Mercurial Contributors
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from __future__ import absolute_import
import os
from . import (
encoding,
pycompat,
util,
)
Jun Wu
codemod: use pycompat.iswindows...
r34646 if pycompat.iswindows:
Jun Wu
rcutil: move scmutil.*rcpath to rcutil (API)...
r31679 from . import scmwindows as scmplatform
else:
from . import scmposix as scmplatform
Yuya Nishihara
pager: use less as a fallback on Unix...
r32078 fallbackpager = scmplatform.fallbackpager
Jun Wu
rcutil: move scmutil.*rcpath to rcutil (API)...
r31679 systemrcpath = scmplatform.systemrcpath
userrcpath = scmplatform.userrcpath
Jun Wu
rcutil: extract rc directory listing logic...
r31681 def _expandrcpath(path):
'''path could be a file or a directory. return a list of file paths'''
p = util.expandpath(path)
if os.path.isdir(p):
join = os.path.join
Yuya Nishihara
osutil: proxy through util (and platform) modules (API)...
r32203 return [join(p, f) for f, k in util.listdir(p) if f.endswith('.rc')]
Jun Wu
rcutil: extract rc directory listing logic...
r31681 return [p]
Jun Wu
rcutil: add a method to convert environment variables to config items...
r31684 def envrcitems(env=None):
'''Return [(section, name, value, source)] config items.
The config items are extracted from environment variables specified by env,
used to override systemrc, but not userrc.
If env is not provided, encoding.environ will be used.
'''
if env is None:
env = encoding.environ
checklist = [
('EDITOR', 'ui', 'editor'),
('VISUAL', 'ui', 'editor'),
('PAGER', 'pager', 'pager'),
]
result = []
for envname, section, configname in checklist:
if envname not in env:
continue
result.append((section, configname, env[envname], '$%s' % envname))
return result
Jun Wu
rcutil: split osrcpath to return default.d paths (API)...
r31680 def defaultrcpath():
'''return rc paths in default.d'''
Jun Wu
rcutil: move scmutil.*rcpath to rcutil (API)...
r31679 path = []
defaultpath = os.path.join(util.datapath, 'default.d')
if os.path.isdir(defaultpath):
Jun Wu
rcutil: extract rc directory listing logic...
r31681 path = _expandrcpath(defaultpath)
Jun Wu
rcutil: move scmutil.*rcpath to rcutil (API)...
r31679 return path
Jun Wu
rcutil: rename rcpath to rccomponents (API)
r31682 def rccomponents():
Jun Wu
rcutil: let rccomponents return different types of configs (API)...
r31683 '''return an ordered [(type, obj)] about where to load configs.
respect $HGRCPATH. if $HGRCPATH is empty, only .hg/hgrc of current repo is
used. if $HGRCPATH is not set, the platform default will be used.
if a directory is provided, *.rc files under it will be used.
type could be either 'path' or 'items', if type is 'path', obj is a string,
and is the config file path. if type is 'items', obj is a list of (section,
name, value, source) that should fill the config directly.
'''
Jun Wu
rcutil: let environ override system configs (BC)...
r31685 envrc = ('items', envrcitems())
Jun Wu
rcutil: unindent a block...
r31693 if 'HGRCPATH' in encoding.environ:
# assume HGRCPATH is all about user configs so environments can be
# overridden.
_rccomponents = [envrc]
for p in encoding.environ['HGRCPATH'].split(pycompat.ospathsep):
if not p:
continue
_rccomponents.extend(('path', p) for p in _expandrcpath(p))
else:
Jun Wu
rcutil: extract duplicated logic to a lambda...
r31694 normpaths = lambda paths: [('path', os.path.normpath(p)) for p in paths]
_rccomponents = normpaths(defaultrcpath() + systemrcpath())
Jun Wu
rcutil: unindent a block...
r31693 _rccomponents.append(envrc)
Jun Wu
rcutil: extract duplicated logic to a lambda...
r31694 _rccomponents.extend(normpaths(userrcpath()))
Jun Wu
rcutil: rename rcpath to rccomponents (API)
r31682 return _rccomponents
Jun Wu
pager: set some environment variables if they're not set...
r31954
def defaultpagerenv():
'''return a dict of default environment variables and their values,
intended to be set before starting a pager.
'''
return {'LESS': 'FRX', 'LV': '-c'}