aboutsummaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2014-08-31 22:48:53 +0000
committerDaniele Tricoli <eriol@mornie.org>2014-08-31 22:48:53 +0000
commit5074da0fb36b78402877d7626982a70aafe2e5dd (patch)
treeb01ddb870079dffba6fab2129b125249170e4791 /debian/patches
parent4dc005d9567d988b37c751ebfb65b18ecd4514ce (diff)
downloadpython-urllib3-5074da0fb36b78402877d7626982a70aafe2e5dd.tar
python-urllib3-5074da0fb36b78402877d7626982a70aafe2e5dd.tar.gz
Refresh 02_require-cert-verification.patch
Diffstat (limited to 'debian/patches')
-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 1c09012..1b5992c 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-05-24
+Last-Update: 2014-09-01
--- a/urllib3/connectionpool.py
+++ b/urllib3/connectionpool.py
-@@ -591,6 +591,8 @@
+@@ -628,6 +628,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,9 +16,9 @@ Last-Update: 2014-05-24
"""
scheme = 'https'
-@@ -600,8 +602,8 @@
- strict=False, timeout=None, maxsize=1,
- block=False, headers=None,
+@@ -637,8 +639,8 @@
+ strict=False, timeout=Timeout.DEFAULT_TIMEOUT, maxsize=1,
+ block=False, headers=None, retries=None,
_proxy=None, _proxy_headers=None,
- key_file=None, cert_file=None, cert_reqs=None,
- ca_certs=None, ssl_version=None,