Don't write two content-length headers
This commit is contained in:
@@ -127,18 +127,20 @@ class HttpProtocol(BaseHTTPServer.BaseHTTPRequestHandler):
|
|||||||
for k, v in response_headers:
|
for k, v in response_headers:
|
||||||
header_dict[k.lower()] = k
|
header_dict[k.lower()] = k
|
||||||
towrite.append('%s %s\r\n' % (self.protocol_version, status))
|
towrite.append('%s %s\r\n' % (self.protocol_version, status))
|
||||||
|
for header in response_headers:
|
||||||
|
towrite.append('%s: %s\r\n' % header)
|
||||||
|
|
||||||
# send Date header?
|
# send Date header?
|
||||||
if 'date' not in header_dict:
|
if 'date' not in header_dict:
|
||||||
towrite.append('Date: %s\r\n' % (format_date_time(time.time()),))
|
towrite.append('Date: %s\r\n' % (format_date_time(time.time()),))
|
||||||
if num_blocks is not None:
|
if num_blocks is not None:
|
||||||
towrite.append('Content-Length: %s\r\n' % (len(''.join(result)),))
|
if 'content-length' not in header_dict:
|
||||||
|
towrite.append('Content-Length: %s\r\n' % (len(''.join(result)),))
|
||||||
elif use_chunked:
|
elif use_chunked:
|
||||||
towrite.append('Transfer-Encoding: chunked\r\n')
|
towrite.append('Transfer-Encoding: chunked\r\n')
|
||||||
else:
|
else:
|
||||||
towrite.append('Connection: close\r\n')
|
towrite.append('Connection: close\r\n')
|
||||||
self.close_connection = 1
|
self.close_connection = 1
|
||||||
for header in response_headers:
|
|
||||||
towrite.append('%s: %s\r\n' % header)
|
|
||||||
towrite.append('\r\n')
|
towrite.append('\r\n')
|
||||||
|
|
||||||
if use_chunked:
|
if use_chunked:
|
||||||
|
Reference in New Issue
Block a user