Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

make sure to write bytes instead of strings to underlying socket channel

This commit is contained in:
Bill Janssen 2007-10-30 18:13:17 +00:00
parent 8cfe3a3276
commit 1cd5bd2a2e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Lib/BaseHTTPServer.py
View File

@ -356,11 +356,11 @@ class BaseHTTPRequestHandler(SocketServer.StreamRequestHandler):
content = (self.error_message_format % content = (self.error_message_format %
{'code': code, 'message': _quote_html(message), 'explain': explain}) {'code': code, 'message': _quote_html(message), 'explain': explain})
self.send_response(code, message) self.send_response(code, message)
self.send_header("Content-Type", "text/html") self.send_header("Content-Type", "text/html;charset=utf-8")
self.send_header('Connection', 'close') self.send_header('Connection', 'close')
self.end_headers() self.end_headers()
if self.command != 'HEAD' and code >= 200 and code not in (204, 304): if self.command != 'HEAD' and code >= 200 and code not in (204, 304):
self.wfile.write(content) self.wfile.write(content.encode('UTF-8', 'replace'))
error_message_format = DEFAULT_ERROR_MESSAGE error_message_format = DEFAULT_ERROR_MESSAGE
@ -378,8 +378,8 @@ class BaseHTTPRequestHandler(SocketServer.StreamRequestHandler):
else: else:
message = '' message = ''
if self.request_version != 'HTTP/0.9': if self.request_version != 'HTTP/0.9':
self.wfile.write("%s %d %s\r\n" % self.wfile.write(("%s %d %s\r\n" %
(self.protocol_version, code, message)) (self.protocol_version, code, message)).encode('ASCII', 'strict'))
# print (self.protocol_version, code, message) # print (self.protocol_version, code, message)
self.send_header('Server', self.version_string()) self.send_header('Server', self.version_string())
self.send_header('Date', self.date_time_string()) self.send_header('Date', self.date_time_string())
@ -387,7 +387,7 @@ class BaseHTTPRequestHandler(SocketServer.StreamRequestHandler):
def send_header(self, keyword, value): def send_header(self, keyword, value):
"""Send a MIME header.""" """Send a MIME header."""
if self.request_version != 'HTTP/0.9': if self.request_version != 'HTTP/0.9':
self.wfile.write("%s: %s\r\n" % (keyword, value)) self.wfile.write(("%s: %s\r\n" % (keyword, value)).encode('ASCII', 'strict'))
if keyword.lower() == 'connection': if keyword.lower() == 'connection':
if value.lower() == 'close': if value.lower() == 'close':
@ -398,7 +398,7 @@ class BaseHTTPRequestHandler(SocketServer.StreamRequestHandler):
def end_headers(self): def end_headers(self):
"""Send the blank line ending the MIME headers.""" """Send the blank line ending the MIME headers."""
if self.request_version != 'HTTP/0.9': if self.request_version != 'HTTP/0.9':
self.wfile.write("\r\n") self.wfile.write(b"\r\n")
def log_request(self, code='-', size='-'): def log_request(self, code='-', size='-'):
"""Log an accepted request. """Log an accepted request.