Blame SOURCES/grpc-1.48.4-wrap_socket.patch
|
 |
cd4c38 |
From 15b168ffc762f99997c57a34c4cbb595697ede79 Mon Sep 17 00:00:00 2001
|
|
|
cd4c38 |
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
|
|
|
cd4c38 |
Date: Tue, 20 Jun 2023 09:05:35 -0400
|
|
|
cd4c38 |
Subject: [PATCH] Use ssl.SSLContext.wrap_socket, not ssl.wrap_socket
|
|
|
cd4c38 |
|
|
|
cd4c38 |
The latter emits a DeprecationWarning since Python 3.10 and is removed
|
|
|
cd4c38 |
in Python 3.12.
|
|
|
cd4c38 |
---
|
|
|
cd4c38 |
test/core/http/test_server.py | 7 +++----
|
|
|
cd4c38 |
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
cd4c38 |
|
|
|
cd4c38 |
diff --git a/test/core/http/test_server.py b/test/core/http/test_server.py
|
|
|
cd4c38 |
index abd26c53d3..7c01638d8b 100755
|
|
|
cd4c38 |
--- a/test/core/http/test_server.py
|
|
|
cd4c38 |
+++ b/test/core/http/test_server.py
|
|
|
cd4c38 |
@@ -62,8 +62,7 @@ class Handler(BaseHTTPRequestHandler):
|
|
|
cd4c38 |
|
|
|
cd4c38 |
httpd = HTTPServer(('localhost', args.port), Handler)
|
|
|
cd4c38 |
if args.ssl:
|
|
|
cd4c38 |
- httpd.socket = ssl.wrap_socket(httpd.socket,
|
|
|
cd4c38 |
- certfile=_PEM,
|
|
|
cd4c38 |
- keyfile=_KEY,
|
|
|
cd4c38 |
- server_side=True)
|
|
|
cd4c38 |
+ ctx = ssl.SSLContext()
|
|
|
cd4c38 |
+ ctx.load_cert_chain(certfile=_PEM, keyfile=_KEY)
|
|
|
cd4c38 |
+ httpd.socket = ctx.wrap_socket(httpd.socket, server_side=True)
|
|
|
cd4c38 |
httpd.serve_forever()
|
|
|
cd4c38 |
--
|
|
|
cd4c38 |
2.40.1
|
|
|
cd4c38 |
|