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

use splitlines function

Browse Source
This commit is contained in:
benoitc 2010-08-11 22:36:17 +02:00
parent 2b0f37b6b1
commit cf8a31264e
1 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
gunicorn/http/message.py
View File

@ -19,15 +19,17 @@ class Message(object):
def __init__(self, unreader): def __init__(self, unreader):
self.unreader = unreader self.unreader = unreader
self.version = None self.version = None
self.connection_hdr = None self.headers = []
self.connection = None
self.chunked = False self.chunked = False
self.clength = None self.clength = None
self.headers = []
self.length = []
self.trailers = [] self.trailers = []
self.body = None self.body = None
self.hdrre = re.compile("[\x00-\x1F\x7F()<>@,;:\[\]={} \t\\\\\"]") self.hdrre = re.compile("[\x00-\x1F\x7F()<>@,;:\[\]={} \t\\\\\"]")
unused = self.parse(self.unreader) unused = self.parse(self.unreader)
self.unreader.unread(unused) self.unreader.unread(unused)
self.set_body_reader() self.set_body_reader()
@ -39,7 +41,7 @@ class Message(object):
headers = [] headers = []
# Split lines on \r\n keeping the \r\n on each line # Split lines on \r\n keeping the \r\n on each line
lines = [line + "\r\n" for line in data.split("\r\n")] lines = data.splitlines(True)
# Parse headers into key/value pairs paying attention # Parse headers into key/value pairs paying attention
# to continuation lines. # to continuation lines.
@ -48,7 +50,9 @@ class Message(object):
curr = lines.pop(0) curr = lines.pop(0)
if curr.find(":") < 0: if curr.find(":") < 0:
raise InvalidHeader(curr.strip()) raise InvalidHeader(curr.strip())
name, value = curr.split(":", 1) name, value = curr.split(":", 1)
name = name.rstrip(" \t").upper() name = name.rstrip(" \t").upper()
if self.hdrre.search(name): if self.hdrre.search(name):
raise InvalidHeaderName(name) raise InvalidHeaderName(name)
@ -58,23 +62,32 @@ class Message(object):
while len(lines) and lines[0].startswith((" ", "\t")): while len(lines) and lines[0].startswith((" ", "\t")):
value.append(lines.pop(0)) value.append(lines.pop(0))
value = ''.join(value).rstrip() value = ''.join(value).rstrip()
headers.append((name, value))
if name == "CONNECTION": if name == "CONNECTION":
self.connection_hdr = value self.connection = value.lower().strip()
elif name == "CONTENT-LENGTH": elif name == "CONTENT-LENGTH":
try: try:
self.clength = int(value) self.clength = int(value)
except ValueError: except ValueError:
pass pass
elif name == "TRANSFER-ENCODING":
self.chunked = value.lower() == "chunked"
elif name == "SEC-WEBSOCKET-KEY1":
self.clength = 8
headers.append((name, value)) elif name == "TRANSFER-ENCODING":
self.chunked = value.lower() == "chunked"
elif name == "SEC-WEBSOCKET-KEY1":
if not self.clength:
self.clength = 8
return headers return headers
def set_body_reader(self): def set_body_reader(self):
clength = None
chunked = False
if self.chunked: if self.chunked:
self.body = Body(ChunkedReader(self, self.unreader)) self.body = Body(ChunkedReader(self, self.unreader))
elif self.clength is not None: elif self.clength is not None:
@ -83,12 +96,10 @@ class Message(object):
self.body = Body(EOFReader(self.unreader)) self.body = Body(EOFReader(self.unreader))
def should_close(self): def should_close(self):
if self.connection_hdr is not None: if self.connection == "close":
v = self.connection_hdr.lower().strip() return True
if v == "close": elif self.connection == "keep-alive":
return True return False
elif v == "keep-alive":
return False
return self.version <= (1, 0) return self.version <= (1, 0)