diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 08:56:12 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 08:56:12 +0000 |
| commit | 5fc9e0f4acbb0647b6564d091257340b4ce800f1 (patch) | |
| tree | 7c2ae9ffc1d5f93f36444e153ddaed2434612f9e /testenv/server | |
| parent | Releasing progress-linux version 1.21.4-1~progress7.99u1. (diff) | |
| download | wget-5fc9e0f4acbb0647b6564d091257340b4ce800f1.tar.xz wget-5fc9e0f4acbb0647b6564d091257340b4ce800f1.zip | |
Merging upstream version 1.24.5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'testenv/server')
| -rw-r--r-- | testenv/server/http/http_server.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/testenv/server/http/http_server.py b/testenv/server/http/http_server.py index 2cc82fb..fd6121a 100644 --- a/testenv/server/http/http_server.py +++ b/testenv/server/http/http_server.py @@ -47,10 +47,10 @@ class HTTPSServer(StoppableHTTPServer): os.getenv('srcdir', '.'), 'certs', 'server-key.pem')) - self.socket = ssl.wrap_socket( + ctx = ssl.SSLContext(protocol=ssl.PROTOCOL_TLS_SERVER) + ctx.load_cert_chain(CERTFILE, KEYFILE) + self.socket = ctx.wrap_socket( sock=socket.socket(self.address_family, self.socket_type), - certfile=CERTFILE, - keyfile=KEYFILE, server_side=True ) self.server_bind() |