forked from pool/python-urllib3
3f19e47238
- merge python3 modifications - update for multipython build - update to 1.20: * Added support for waiting for I/O using selectors other than select, improving urllib3’s behaviour with large numbers of concurrent connections. (Pull #1001) * Updated the date for the system clock check. (Issue #1005) * ConnectionPools now correctly consider hostnames to be case-insensitive. (Issue #1032) * Outdated versions of PyOpenSSL now cause the PyOpenSSL contrib module to fail when it is injected, rather than at first use. (Pull #1063) * Outdated versions of cryptography now cause the PyOpenSSL contrib module to fail when it is injected, rather than at first use. (Issue #1044) * Automatically attempt to rewind a file-like body object when a request is retried or redirected. (Pull #1039) * Fix some bugs that occur when modules incautiously patch the queue module. (Pull #1061) * Prevent retries from occuring on read timeouts for which the request method was not in the method whitelist. (Issue #1059) * Changed the PyOpenSSL contrib module to lazily load idna to avoid unnecessarily bloating the memory of programs that don’t need it. (Pull #1076) * Add support for IPv6 literals with zone identifiers. (Pull #1013) * Added support for socks5h:// and socks4a:// schemes when working with SOCKS proxies, and controlled remote DNS appropriately. (Issue #1035) OBS-URL: https://build.opensuse.org/request/show/486170 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-urllib3?expand=0&rev=25
14 lines
605 B
Diff
14 lines
605 B
Diff
Index: b/urllib3/util/ssl_.py
|
|
===================================================================
|
|
--- a/urllib3/util/ssl_.py
|
|
+++ b/urllib3/util/ssl_.py
|
|
@@ -317,6 +317,8 @@ def ssl_wrap_socket(sock, keyfile=None,
|
|
elif getattr(context, 'load_default_certs', None) is not None:
|
|
# try to load OS default certs; works well on Windows (require Python3.4+)
|
|
context.load_default_certs()
|
|
+ elif cert_reqs != ssl.CERT_NONE and hasattr(context, 'set_default_verify_paths'):
|
|
+ context.set_default_verify_paths()
|
|
|
|
if certfile:
|
|
context.load_cert_chain(certfile, keyfile)
|