From 0451fe30bd27430609dd525beab1b6d4de5a72c0 Mon Sep 17 00:00:00 2001 From: Manav Avlani Date: Fri, 19 Apr 2024 19:52:26 -0700 Subject: [PATCH 1/2] Use proxy ssl context consistently --- httpx/_transports/default.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/httpx/_transports/default.py b/httpx/_transports/default.py index bcc8bf422b..43a6bbbbf0 100644 --- a/httpx/_transports/default.py +++ b/httpx/_transports/default.py @@ -188,6 +188,7 @@ def __init__( target=proxy.url.raw_path, ), proxy_auth=proxy.raw_auth, + proxy_ssl_context=proxy.ssl_context, ssl_context=ssl_context, max_connections=limits.max_connections, max_keepalive_connections=limits.max_keepalive_connections, @@ -303,6 +304,7 @@ def __init__( ), proxy_auth=proxy.raw_auth, proxy_headers=proxy.headers.raw, + proxy_ssl_context=proxy.ssl_context, ssl_context=ssl_context, max_connections=limits.max_connections, max_keepalive_connections=limits.max_keepalive_connections, @@ -328,6 +330,7 @@ def __init__( target=proxy.url.raw_path, ), proxy_auth=proxy.raw_auth, + proxy_ssl_context=proxy.ssl_context, ssl_context=ssl_context, max_connections=limits.max_connections, max_keepalive_connections=limits.max_keepalive_connections, From 166e8b60db9f4fddb31582c4cd77940ad7ba9298 Mon Sep 17 00:00:00 2001 From: Manav Avlani Date: Fri, 19 Apr 2024 20:07:52 -0700 Subject: [PATCH 2/2] Use proxy ssl context consistently-2 --- httpx/_transports/default.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/httpx/_transports/default.py b/httpx/_transports/default.py index 43a6bbbbf0..33db416dd1 100644 --- a/httpx/_transports/default.py +++ b/httpx/_transports/default.py @@ -188,7 +188,6 @@ def __init__( target=proxy.url.raw_path, ), proxy_auth=proxy.raw_auth, - proxy_ssl_context=proxy.ssl_context, ssl_context=ssl_context, max_connections=limits.max_connections, max_keepalive_connections=limits.max_keepalive_connections, @@ -330,7 +329,6 @@ def __init__( target=proxy.url.raw_path, ), proxy_auth=proxy.raw_auth, - proxy_ssl_context=proxy.ssl_context, ssl_context=ssl_context, max_connections=limits.max_connections, max_keepalive_connections=limits.max_keepalive_connections,