| durin42 |
| hg-reviewers |
PEP 3333 says that REQUEST_METHOD is always defined.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/hgweb/request.py (5 lines) | |||
| M | mercurial/wireprotoserver.py (2 lines) |
| bytesform[pycompat.bytesurl(k)] = [ | bytesform[pycompat.bytesurl(k)] = [ | ||||
| pycompat.bytesurl(i.strip()) for i in v] | pycompat.bytesurl(i.strip()) for i in v] | ||||
| return bytesform | return bytesform | ||||
| @attr.s(frozen=True) | @attr.s(frozen=True) | ||||
| class parsedrequest(object): | class parsedrequest(object): | ||||
| """Represents a parsed WSGI request / static HTTP request parameters.""" | """Represents a parsed WSGI request / static HTTP request parameters.""" | ||||
| # Request method. | |||||
| method = attr.ib() | |||||
| # Full URL for this request. | # Full URL for this request. | ||||
| url = attr.ib() | url = attr.ib() | ||||
| # URL without any path components. Just <proto>://<host><port>. | # URL without any path components. Just <proto>://<host><port>. | ||||
| baseurl = attr.ib() | baseurl = attr.ib() | ||||
| # Advertised URL. Like ``url`` and ``baseurl`` but uses SERVER_NAME instead | # Advertised URL. Like ``url`` and ``baseurl`` but uses SERVER_NAME instead | ||||
| # of HTTP: Host header for hostname. This is likely what clients used. | # of HTTP: Host header for hostname. This is likely what clients used. | ||||
| advertisedurl = attr.ib() | advertisedurl = attr.ib() | ||||
| advertisedbaseurl = attr.ib() | advertisedbaseurl = attr.ib() | ||||
| # This is kind of a lie because the HTTP header wasn't explicitly | # This is kind of a lie because the HTTP header wasn't explicitly | ||||
| # sent. But for all intents and purposes it should be OK to lie about | # sent. But for all intents and purposes it should be OK to lie about | ||||
| # this, since a consumer will either either value to determine how many | # this, since a consumer will either either value to determine how many | ||||
| # bytes are available to read. | # bytes are available to read. | ||||
| if 'CONTENT_LENGTH' in env and 'HTTP_CONTENT_LENGTH' not in env: | if 'CONTENT_LENGTH' in env and 'HTTP_CONTENT_LENGTH' not in env: | ||||
| headers['Content-Length'] = env['CONTENT_LENGTH'] | headers['Content-Length'] = env['CONTENT_LENGTH'] | ||||
| return parsedrequest(url=fullurl, baseurl=baseurl, | return parsedrequest(method=env['REQUEST_METHOD'], | ||||
| url=fullurl, baseurl=baseurl, | |||||
| advertisedurl=advertisedfullurl, | advertisedurl=advertisedfullurl, | ||||
| advertisedbaseurl=advertisedbaseurl, | advertisedbaseurl=advertisedbaseurl, | ||||
| apppath=apppath, | apppath=apppath, | ||||
| dispatchparts=dispatchparts, dispatchpath=dispatchpath, | dispatchparts=dispatchparts, dispatchpath=dispatchpath, | ||||
| havepathinfo='PATH_INFO' in env, | havepathinfo='PATH_INFO' in env, | ||||
| querystring=querystring, | querystring=querystring, | ||||
| querystringlist=querystringlist, | querystringlist=querystringlist, | ||||
| querystringdict=querystringdict, | querystringdict=querystringdict, | ||||
| # Clients using Python's httplib are stateful: the HTTP client | # Clients using Python's httplib are stateful: the HTTP client | ||||
| # won't process an HTTP response until all request data is | # won't process an HTTP response until all request data is | ||||
| # sent to the server. The intent of this code is to ensure | # sent to the server. The intent of this code is to ensure | ||||
| # we always read HTTP request data from the client, thus | # we always read HTTP request data from the client, thus | ||||
| # ensuring httplib transitions to a state that allows it to read | # ensuring httplib transitions to a state that allows it to read | ||||
| # the HTTP response. In other words, it helps prevent deadlocks | # the HTTP response. In other words, it helps prevent deadlocks | ||||
| # on clients using httplib. | # on clients using httplib. | ||||
| if (wsgireq.env[r'REQUEST_METHOD'] == r'POST' and | if (req.method == 'POST' and | ||||
| # But not if Expect: 100-continue is being used. | # But not if Expect: 100-continue is being used. | ||||
| (req.headers.get('Expect', '').lower() != '100-continue')): | (req.headers.get('Expect', '').lower() != '100-continue')): | ||||
| wsgireq.drain() | wsgireq.drain() | ||||
| else: | else: | ||||
| wsgireq.headers.append((r'Connection', r'Close')) | wsgireq.headers.append((r'Connection', r'Close')) | ||||
| # TODO This response body assumes the failed command was | # TODO This response body assumes the failed command was | ||||
| # "unbundle." That assumption is not always valid. | # "unbundle." That assumption is not always valid. | ||||