aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/02_require-cert-verification.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/02_require-cert-verification.patch')
-rw-r--r--debian/patches/02_require-cert-verification.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches/02_require-cert-verification.patch b/debian/patches/02_require-cert-verification.patch
index 14b6a73..1c09012 100644
--- a/debian/patches/02_require-cert-verification.patch
+++ b/debian/patches/02_require-cert-verification.patch
@@ -3,11 +3,11 @@ Description: require SSL certificate validation by default by using
CERT_REQUIRED and using the system /etc/ssl/certs/ca-certificates.crt
Bug-Ubuntu: https://launchpad.net/bugs/1047054
Bug-Debian: http://bugs.debian.org/686872
-Last-Update: 2014-03-31
+Last-Update: 2014-05-24
--- a/urllib3/connectionpool.py
+++ b/urllib3/connectionpool.py
-@@ -583,6 +583,8 @@
+@@ -591,6 +591,8 @@
``ssl_version`` are only used if :mod:`ssl` is available and are fed into
:meth:`urllib3.util.ssl_wrap_socket` to upgrade the connection socket
into an SSL socket.
@@ -16,7 +16,7 @@ Last-Update: 2014-03-31
"""
scheme = 'https'
-@@ -592,8 +594,8 @@
+@@ -600,8 +602,8 @@
strict=False, timeout=None, maxsize=1,
block=False, headers=None,
_proxy=None, _proxy_headers=None,
@@ -24,6 +24,6 @@ Last-Update: 2014-03-31
- ca_certs=None, ssl_version=None,
+ key_file=None, cert_file=None, cert_reqs='CERT_REQUIRED',
+ ca_certs='/etc/ssl/certs/ca-certificates.crt', ssl_version=None,
- assert_hostname=None, assert_fingerprint=None):
+ assert_hostname=None, assert_fingerprint=None,
+ **conn_kw):
- HTTPConnectionPool.__init__(self, host, port, strict, timeout, maxsize,