@@ -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 " %
0 commit comments