mirror of https://github.com/python/cpython
Merge socketserver fixes from 3.6
This commit is contained in:
commit
2e610df572
|
@ -16,7 +16,7 @@ here = os.path.dirname(__file__)
|
||||||
HOST = support.HOST
|
HOST = support.HOST
|
||||||
CERTFILE = os.path.join(here, 'keycert.pem')
|
CERTFILE = os.path.join(here, 'keycert.pem')
|
||||||
|
|
||||||
# This one's based on HTTPServer, which is based on SocketServer
|
# This one's based on HTTPServer, which is based on socketserver
|
||||||
|
|
||||||
class HTTPSServer(_HTTPServer):
|
class HTTPSServer(_HTTPServer):
|
||||||
|
|
||||||
|
|
|
@ -2734,7 +2734,7 @@ if _have_threads:
|
||||||
s.close()
|
s.close()
|
||||||
|
|
||||||
def test_socketserver(self):
|
def test_socketserver(self):
|
||||||
"""Using a SocketServer to create and manage SSL connections."""
|
"""Using socketserver to create and manage SSL connections."""
|
||||||
server = make_https_server(self, certfile=CERTFILE)
|
server = make_https_server(self, certfile=CERTFILE)
|
||||||
# try to connect
|
# try to connect
|
||||||
if support.verbose:
|
if support.verbose:
|
||||||
|
|
|
@ -4973,7 +4973,7 @@ Library
|
||||||
|
|
||||||
- Issue #18643: Add socket.socketpair() on Windows.
|
- Issue #18643: Add socket.socketpair() on Windows.
|
||||||
|
|
||||||
- Issue #22435: Fix a file descriptor leak when SocketServer bind fails.
|
- Issue #22435: Fix a file descriptor leak when socketserver bind fails.
|
||||||
|
|
||||||
- Issue #13096: Fixed segfault in CTypes POINTER handling of large
|
- Issue #13096: Fixed segfault in CTypes POINTER handling of large
|
||||||
values.
|
values.
|
||||||
|
|
Loading…
Reference in New Issue