OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-httplib2?expand=0&rev=71
This commit is contained in:
parent
a21a4af214
commit
a526ed3d3e
@ -2,9 +2,13 @@ Index: httplib2-0.10.3/python2/httplib2/__init__.py
|
|||||||
===================================================================
|
===================================================================
|
||||||
--- httplib2-0.10.3.orig/python2/httplib2/__init__.py
|
--- httplib2-0.10.3.orig/python2/httplib2/__init__.py
|
||||||
+++ httplib2-0.10.3/python2/httplib2/__init__.py
|
+++ httplib2-0.10.3/python2/httplib2/__init__.py
|
||||||
@@ -87,7 +87,17 @@ def _ssl_wrap_socket(sock, key_file, cer
|
@@ -83,11 +83,18 @@ def _ssl_wrap_socket(sock, key_file, cer
|
||||||
ssl_version = ssl.PROTOCOL_SSLv23
|
cert_reqs = ssl.CERT_NONE
|
||||||
|
else:
|
||||||
|
cert_reqs = ssl.CERT_REQUIRED
|
||||||
|
- if ssl_version is None:
|
||||||
|
- ssl_version = ssl.PROTOCOL_SSLv23
|
||||||
|
-
|
||||||
if hasattr(ssl, 'SSLContext'): # Python 2.7.9
|
if hasattr(ssl, 'SSLContext'): # Python 2.7.9
|
||||||
- context = ssl.SSLContext(ssl_version)
|
- context = ssl.SSLContext(ssl_version)
|
||||||
+ cafile = ca_certs
|
+ cafile = ca_certs
|
||||||
@ -21,6 +25,16 @@ Index: httplib2-0.10.3/python2/httplib2/__init__.py
|
|||||||
context.verify_mode = cert_reqs
|
context.verify_mode = cert_reqs
|
||||||
context.check_hostname = (cert_reqs != ssl.CERT_NONE)
|
context.check_hostname = (cert_reqs != ssl.CERT_NONE)
|
||||||
if cert_file:
|
if cert_file:
|
||||||
|
@@ -96,6 +103,9 @@ def _ssl_wrap_socket(sock, key_file, cer
|
||||||
|
context.load_verify_locations(ca_certs)
|
||||||
|
return context.wrap_socket(sock, server_hostname=hostname)
|
||||||
|
else:
|
||||||
|
+ if ssl_version is None:
|
||||||
|
+ ssl_version = ssl.PROTOCOL_SSLv23
|
||||||
|
+
|
||||||
|
return ssl.wrap_socket(sock, keyfile=key_file, certfile=cert_file,
|
||||||
|
cert_reqs=cert_reqs, ca_certs=ca_certs,
|
||||||
|
ssl_version=ssl_version)
|
||||||
@@ -210,15 +220,8 @@ class NotRunningAppEngineEnvironment(Htt
|
@@ -210,15 +220,8 @@ class NotRunningAppEngineEnvironment(Htt
|
||||||
# requesting that URI again.
|
# requesting that URI again.
|
||||||
DEFAULT_MAX_REDIRECTS = 5
|
DEFAULT_MAX_REDIRECTS = 5
|
||||||
|
Loading…
Reference in New Issue
Block a user