From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 18 Feb 2015 02:13:30 +0000 (-0500)
Subject: merge 3.4 (#23410)
X-Git-Tag: v3.5.0a2~124
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1130c7f6935bb5d5f75a4e6138efce2496cbc28f;p=python

merge 3.4 (#23410)
---

1130c7f6935bb5d5f75a4e6138efce2496cbc28f
diff --cc Lib/http/server.py
index a2425f2386,47655e758a..4704d5141a
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@@ -300,24 -296,20 +300,24 @@@ class BaseHTTPRequestHandler(socketserv
                      raise ValueError
                  version_number = int(version_number[0]), int(version_number[1])
              except (ValueError, IndexError):
 -                self.send_error(400, "Bad request version (%r)" % version)
 +                self.send_error(
 +                    HTTPStatus.BAD_REQUEST,
 +                    "Bad request version (%r)" % version)
                  return False
              if version_number >= (1, 1) and self.protocol_version >= "HTTP/1.1":
-                 self.close_connection = 0
+                 self.close_connection = False
              if version_number >= (2, 0):
 -                self.send_error(505,
 -                          "Invalid HTTP Version (%s)" % base_version_number)
 +                self.send_error(
 +                    HTTPStatus.HTTP_VERSION_NOT_SUPPORTED,
 +                    "Invalid HTTP Version (%s)" % base_version_number)
                  return False
          elif len(words) == 2:
              command, path = words
-             self.close_connection = 1
+             self.close_connection = True
              if command != 'GET':
 -                self.send_error(400,
 -                                "Bad HTTP/0.9 request type (%r)" % command)
 +                self.send_error(
 +                    HTTPStatus.BAD_REQUEST,
 +                    "Bad HTTP/0.9 request type (%r)" % command)
                  return False
          elif not words:
              return False
@@@ -385,10 -373,10 +385,10 @@@
                  self.requestline = ''
                  self.request_version = ''
                  self.command = ''
 -                self.send_error(414)
 +                self.send_error(HTTPStatus.REQUEST_URI_TOO_LONG)
                  return
              if not self.raw_requestline:
-                 self.close_connection = 1
+                 self.close_connection = True
                  return
              if not self.parse_request():
                  # An error code has been sent, just exit