Merge branch 'mikoim-feature/statuscode'

This commit is contained in:
Ubuntu 2016-10-19 08:37:56 +00:00
commit 138b947b95

View File

@ -1,18 +1,69 @@
import ujson import ujson
STATUS_CODES = { COMMON_STATUS_CODES = {
200: b'OK', 200: b'OK',
400: b'Bad Request', 400: b'Bad Request',
404: b'Not Found',
500: b'Internal Server Error',
}
ALL_STATUS_CODES = {
100: b'Continue',
101: b'Switching Protocols',
102: b'Processing',
200: b'OK',
201: b'Created',
202: b'Accepted',
203: b'Non-Authoritative Information',
204: b'No Content',
205: b'Reset Content',
206: b'Partial Content',
207: b'Multi-Status',
208: b'Already Reported',
226: b'IM Used',
300: b'Multiple Choices',
301: b'Moved Permanently',
302: b'Found',
303: b'See Other',
304: b'Not Modified',
305: b'Use Proxy',
307: b'Temporary Redirect',
308: b'Permanent Redirect',
400: b'Bad Request',
401: b'Unauthorized', 401: b'Unauthorized',
402: b'Payment Required', 402: b'Payment Required',
403: b'Forbidden', 403: b'Forbidden',
404: b'Not Found', 404: b'Not Found',
405: b'Method Not Allowed', 405: b'Method Not Allowed',
406: b'Not Acceptable',
407: b'Proxy Authentication Required',
408: b'Request Timeout',
409: b'Conflict',
410: b'Gone',
411: b'Length Required',
412: b'Precondition Failed',
413: b'Request Entity Too Large',
414: b'Request-URI Too Long',
415: b'Unsupported Media Type',
416: b'Requested Range Not Satisfiable',
417: b'Expectation Failed',
422: b'Unprocessable Entity',
423: b'Locked',
424: b'Failed Dependency',
426: b'Upgrade Required',
428: b'Precondition Required',
429: b'Too Many Requests',
431: b'Request Header Fields Too Large',
500: b'Internal Server Error', 500: b'Internal Server Error',
501: b'Not Implemented', 501: b'Not Implemented',
502: b'Bad Gateway', 502: b'Bad Gateway',
503: b'Service Unavailable', 503: b'Service Unavailable',
504: b'Gateway Timeout', 504: b'Gateway Timeout',
505: b'HTTP Version Not Supported',
506: b'Variant Also Negotiates',
507: b'Insufficient Storage',
508: b'Loop Detected',
510: b'Not Extended',
511: b'Network Authentication Required'
} }
@ -44,6 +95,13 @@ class HTTPResponse:
b'%b: %b\r\n' % (name.encode(), value.encode('utf-8')) b'%b: %b\r\n' % (name.encode(), value.encode('utf-8'))
for name, value in self.headers.items() for name, value in self.headers.items()
) )
# Try to pull from the common codes first
# Speeds up response rate 6% over pulling from all
status = COMMON_STATUS_CODES.get(self.status)
if not status:
status = ALL_STATUS_CODES.get(self.status)
return (b'HTTP/%b %d %b\r\n' return (b'HTTP/%b %d %b\r\n'
b'Content-Type: %b\r\n' b'Content-Type: %b\r\n'
b'Content-Length: %d\r\n' b'Content-Length: %d\r\n'
@ -52,7 +110,7 @@ class HTTPResponse:
b'%b') % ( b'%b') % (
version.encode(), version.encode(),
self.status, self.status,
STATUS_CODES.get(self.status, b'FAIL'), status,
self.content_type.encode(), self.content_type.encode(),
len(self.body), len(self.body),
b'keep-alive' if keep_alive else b'close', b'keep-alive' if keep_alive else b'close',