diff options
| author | Daniele Tricoli <eriol@mornie.org> | 2014-05-24 17:17:39 +0000 |
|---|---|---|
| committer | Daniele Tricoli <eriol@mornie.org> | 2014-05-24 17:17:39 +0000 |
| commit | 8ef7b13ab10cdc5d29eb8c3489ecf47aa62edf02 (patch) | |
| tree | b70030fd1747e7f524696dcb1228454c01114bd4 | |
| parent | 2dbb15409aa65fdd002d9ea105b0065882bc9309 (diff) | |
| download | python-urllib3-8ef7b13ab10cdc5d29eb8c3489ecf47aa62edf02.tar python-urllib3-8ef7b13ab10cdc5d29eb8c3489ecf47aa62edf02.tar.gz | |
Refreshed 02_require-cert-verification.patch
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/02_require-cert-verification.patch | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 0cee92f..495ab62 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,10 @@ python-urllib3 (1.8.2-1) UNRELEASED; urgency=medium * New upstream release * debian/patches/01_do-not-use-embedded-python-six.patch - Refreshed + * debian/patches/02_require-cert-verification.patch + - Refreshed - -- Daniele Tricoli <eriol@mornie.org> Sat, 24 May 2014 16:24:14 +0200 + -- Daniele Tricoli <eriol@mornie.org> Sat, 24 May 2014 19:12:41 +0200 python-urllib3 (1.8-2) unstable; urgency=medium 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, |