Skip to content

Commit 071bb3b

Browse files
committed
Revert psf#6667 to no longer cache a default SSLContext
1 parent 0e322af commit 071bb3b

File tree

1 file changed

+0
-23
lines changed

1 file changed

+0
-23
lines changed

Diff for: src/requests/adapters.py

-23
Original file line numberDiff line numberDiff line change
@@ -74,19 +74,6 @@ def SOCKSProxyManager(*args, **kwargs):
7474
DEFAULT_POOL_TIMEOUT = None
7575

7676

77-
try:
78-
import ssl # noqa: F401
79-
80-
_preloaded_ssl_context = create_urllib3_context()
81-
_preloaded_ssl_context.load_verify_locations(
82-
extract_zipped_paths(DEFAULT_CA_BUNDLE_PATH)
83-
)
84-
except ImportError:
85-
# Bypass default SSLContext creation when Python
86-
# interpreter isn't built with the ssl module.
87-
_preloaded_ssl_context = None
88-
89-
9077
def _urllib3_request_context(
9178
request: "PreparedRequest",
9279
verify: "bool | str | None",
@@ -99,19 +86,9 @@ def _urllib3_request_context(
9986
scheme = parsed_request_url.scheme.lower()
10087
port = parsed_request_url.port
10188

102-
# Determine if we have and should use our default SSLContext
103-
# to optimize performance on standard requests.
104-
poolmanager_kwargs = getattr(poolmanager, "connection_pool_kw", {})
105-
has_poolmanager_ssl_context = poolmanager_kwargs.get("ssl_context")
106-
should_use_default_ssl_context = (
107-
_preloaded_ssl_context is not None and not has_poolmanager_ssl_context
108-
)
109-
11089
cert_reqs = "CERT_REQUIRED"
11190
if verify is False:
11291
cert_reqs = "CERT_NONE"
113-
elif verify is True and should_use_default_ssl_context:
114-
pool_kwargs["ssl_context"] = _preloaded_ssl_context
11592
elif isinstance(verify, str):
11693
if not os.path.isdir(verify):
11794
pool_kwargs["ca_certs"] = verify

0 commit comments

Comments
 (0)