Dirk Mueller
154c4f7af4
update to version v2.12.4 * Python 2 compatibility * adding tests for super_len conditional flow * Check in updated idna. * Test case for requests getting stuck on post redirect with seekable stream * v2.12.2 * added new test, original test restored * Make Response.content return None if raw is None * adding unicode_is_ascii utility function * Update sidebarlogo.html * Fixed another scheme proxy over "all" priority * Add changelog for 1.19.1 * changed behavior of basic-http-auth test * correct backtick formatting * Note @jeremycline is now our contact. * Order of type check * Add prepared request pickling tests * adding comment * Add deprecation warnings for 3.0 * clarify that the `chunk_size` is optional when streaming to a file * adding ISO-8859-1 fallback for reason decoding * fixed some error * pysocks 1.5.7 blacklisting, due to IPv6 problems * Fix tests for new urllib3 exception text. * make add_dict_to_cookiejar cookielib.CookieJar compatible * correct module for cookiejar_from_dict in docs * converting update call to merge_cookies call for cookielib compatibility * streaming doc clarification * removing redundant logic from prepare_content_length * Update certifi certs to 2016.09.26 OBS-URL: https://build.opensuse.org/request/show/447958 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-requests?expand=0&rev=94
22 lines
964 B
Diff
22 lines
964 B
Diff
Index: urllib3-1.19.1/urllib3/util/ssl_.py
|
|
===================================================================
|
|
--- urllib3-1.19.1.orig/urllib3/util/ssl_.py
|
|
+++ urllib3-1.19.1/urllib3/util/ssl_.py
|
|
@@ -314,9 +314,13 @@ def ssl_wrap_socket(sock, keyfile=None,
|
|
if e.errno == errno.ENOENT:
|
|
raise SSLError(e)
|
|
raise
|
|
- 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()
|
|
+ else:
|
|
+ if cert_reqs != ssl.CERT_NONE and hasattr(context, 'set_default_verify_paths'):
|
|
+ context.set_default_verify_paths()
|
|
+
|
|
+ if 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()
|
|
|
|
if certfile:
|
|
context.load_cert_chain(certfile, keyfile)
|