merge 3.4 (#23410)

diff --cc Doc/library/http.server.rst
Simple merge

diff --cc Lib/http/server.py
index a2425f238646ad6e5eb5c8a4e1808480f03b58a8,47655e758aeb5b724177cde125feeb0a2ae66a6b..4704d5141a62c6ba832f933ab2a817ddc131f761
--- 1/Lib/http/server.py
--- 2/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