Skip to content

Commit 50badad

Browse files
committed
Issue python#26586: Simple enhancements to BaseHTTPRequestHandler by Xiang Zhang
1 parent b93e4b2 commit 50badad

2 files changed

Lines changed: 14 additions & 16 deletions

File tree

‎Lib/http/server.py‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class HTTPServer(socketserver.TCPServer):
137137
def server_bind(self):
138138
"""Override server_bind to store the server name."""
139139
socketserver.TCPServer.server_bind(self)
140-
host, port = self.socket.getsockname()[:2]
140+
host, port = self.server_address[:2]
141141
self.server_name = socket.getfqdn(host)
142142
self.server_port = port
143143

@@ -283,12 +283,9 @@ def parse_request(self):
283283
words = requestline.split()
284284
if len(words) == 3:
285285
command, path, version = words
286-
if version[:5] != 'HTTP/':
287-
self.send_error(
288-
HTTPStatus.BAD_REQUEST,
289-
"Bad request version (%r)" % version)
290-
return False
291286
try:
287+
if version[:5] != 'HTTP/':
288+
raise ValueError
292289
base_version_number = version.split('/', 1)[1]
293290
version_number = base_version_number.split(".")
294291
# RFC 2145 section 3.1 says there can be only one "." and
@@ -310,7 +307,7 @@ def parse_request(self):
310307
if version_number >= (2, 0):
311308
self.send_error(
312309
HTTPStatus.HTTP_VERSION_NOT_SUPPORTED,
313-
"Invalid HTTP Version (%s)" % base_version_number)
310+
"Invalid HTTP version (%s)" % base_version_number)
314311
return False
315312
elif len(words) == 2:
316313
command, path = words
@@ -333,10 +330,11 @@ def parse_request(self):
333330
try:
334331
self.headers = http.client.parse_headers(self.rfile,
335332
_class=self.MessageClass)
336-
except http.client.LineTooLong:
333+
except http.client.LineTooLong as err:
337334
self.send_error(
338-
HTTPStatus.BAD_REQUEST,
339-
"Line too long")
335+
HTTPStatus.REQUEST_HEADER_FIELDS_TOO_LARGE,
336+
"Line too long",
337+
str(err))
340338
return False
341339
except http.client.HTTPException as err:
342340
self.send_error(
@@ -482,12 +480,12 @@ def send_response(self, code, message=None):
482480

483481
def send_response_only(self, code, message=None):
484482
"""Send the response header only."""
485-
if message is None:
486-
if code in self.responses:
487-
message = self.responses[code][0]
488-
else:
489-
message = ''
490483
if self.request_version != 'HTTP/0.9':
484+
if message is None:
485+
if code in self.responses:
486+
message = self.responses[code][0]
487+
else:
488+
message = ''
491489
if not hasattr(self, '_headers_buffer'):
492490
self._headers_buffer = []
493491
self._headers_buffer.append(("%s %d %s\r\n" %

‎Lib/test/test_httpservers.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@ def test_header_length(self):
855855
# Issue #6791: same for headers
856856
result = self.send_typical_request(
857857
b'GET / HTTP/1.1\r\nX-Foo: bar' + b'r' * 65537 + b'\r\n\r\n')
858-
self.assertEqual(result[0], b'HTTP/1.1 400 Line too long\r\n')
858+
self.assertEqual(result[0], b'HTTP/1.1 431 Line too long\r\n')
859859
self.assertFalse(self.handler.get_called)
860860
self.assertEqual(self.handler.requestline, 'GET / HTTP/1.1')
861861

0 commit comments

Comments
 (0)