Commit efa68372 authored by Guido van Rossum's avatar Guido van Rossum

Treat all HTTP/1.* versions the same.

parent 2567dd6d
...@@ -236,7 +236,7 @@ class BaseHTTPRequestHandler(SocketServer.StreamRequestHandler): ...@@ -236,7 +236,7 @@ class BaseHTTPRequestHandler(SocketServer.StreamRequestHandler):
words = string.split(requestline) words = string.split(requestline)
if len(words) == 3: if len(words) == 3:
[command, path, version] = words [command, path, version] = words
if version != self.protocol_version: if version[:5] != 'HTTP/':
self.send_error(400, "Bad request version (%s)" % `version`) self.send_error(400, "Bad request version (%s)" % `version`)
return return
elif len(words) == 2: elif len(words) == 2:
...@@ -297,7 +297,7 @@ class BaseHTTPRequestHandler(SocketServer.StreamRequestHandler): ...@@ -297,7 +297,7 @@ class BaseHTTPRequestHandler(SocketServer.StreamRequestHandler):
self.log_request(code) self.log_request(code)
if message is None: if message is None:
if self.responses.has_key(code): if self.responses.has_key(code):
message = self.responses[code][1] message = self.responses[code][0]
else: else:
message = '' message = ''
if self.request_version != 'HTTP/0.9': if self.request_version != 'HTTP/0.9':
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment