jingrow/gunicorn
1
0
Fork 0
mirror of https://github.com/frappe/gunicorn.git synced 2026-01-14 11:09:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix wsgi.input_terminated

Browse Source 
Sometimes both TRANSFER-ENCODING=chunked and CONTENT_LENGTH are set. Since gunicorn prioritise (following the HTTP1.1 spec) chunked encoding we should make sure in this case to signal to th application that the input is terminated by the server.

Without the change gunicorn were always setting wsg.input_terminated to False when a CONTENT_LENGTH header was present ignoring that Gunicorn was afaik handling the termination.
This commit is contained in:
benoitc 2019-11-20 22:46:00 +01:00
parent 8d854ba8cd
commit 265e58f9e8
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gunicorn/http/message.py
View File

@ -33,6 +33,7 @@ class Message(object):
self.version = None self.version = None
self.headers = [] self.headers = []
self.trailers = [] self.trailers = []
self.terminated = True
self.body = None self.body = None
self.scheme = "https" if cfg.is_ssl else "http" self.scheme = "https" if cfg.is_ssl else "http"
@ -151,6 +152,7 @@ class Message(object):
if content_length < 0: if content_length < 0:
raise InvalidHeader("CONTENT-LENGTH", req=self) raise InvalidHeader("CONTENT-LENGTH", req=self)
self.terminated = False
self.body = Body(LengthReader(self.unreader, content_length)) self.body = Body(LengthReader(self.unreader, content_length))
else: else:
self.body = Body(EOFReader(self.unreader)) self.body = Body(EOFReader(self.unreader))

2
gunicorn/http/wsgi.py
View File

@ -82,6 +82,7 @@ def default_environ(req, sock, cfg):
env = base_environ(cfg) env = base_environ(cfg)
env.update({ env.update({
"wsgi.input": req.body, "wsgi.input": req.body,
"wsgi.input_terminated": req.terminated,
"gunicorn.socket": sock, "gunicorn.socket": sock,
"REQUEST_METHOD": req.method, "REQUEST_METHOD": req.method,
"QUERY_STRING": req.query, "QUERY_STRING": req.query,
@ -131,7 +132,6 @@ def create(req, sock, client, server, cfg):
continue continue
elif hdr_name == "CONTENT-LENGTH": elif hdr_name == "CONTENT-LENGTH":
environ['CONTENT_LENGTH'] = hdr_value environ['CONTENT_LENGTH'] = hdr_value
environ['wsgi.input_terminated'] = False
continue continue
key = 'HTTP_' + hdr_name.replace('-', '_') key = 'HTTP_' + hdr_name.replace('-', '_')