aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/02_require-cert-verification.patch
diff options
context:
space:
mode:
authorSVN-Git Migration <python-modules-team@lists.alioth.debian.org>2015-10-08 13:19:52 -0700
committerSVN-Git Migration <python-modules-team@lists.alioth.debian.org>2015-10-08 13:19:52 -0700
commitc81f55d5ea254affbb6d8e87d03098d244ffe468 (patch)
tree80ac480f9e113bc246f8b43edf702caba1b141e3 /debian/patches/02_require-cert-verification.patch
parente233bfa0d673601895c3dccb91dba9f6adff8ef1 (diff)
parent6037bb76fda33e09811e44f56bf3dcc73daeebc4 (diff)
downloadpython-urllib3-c81f55d5ea254affbb6d8e87d03098d244ffe468.tar
python-urllib3-c81f55d5ea254affbb6d8e87d03098d244ffe468.tar.gz
Initialize git-dpm
Diffstat (limited to 'debian/patches/02_require-cert-verification.patch')
-rw-r--r--debian/patches/02_require-cert-verification.patch18
1 files changed, 14 insertions, 4 deletions
diff --git a/debian/patches/02_require-cert-verification.patch b/debian/patches/02_require-cert-verification.patch
index 1b5992c..6973d7a 100644
--- a/debian/patches/02_require-cert-verification.patch
+++ b/debian/patches/02_require-cert-verification.patch
@@ -1,13 +1,23 @@
-Author: Jamie Strandboge <jamie@canonical.com>
-Description: require SSL certificate validation by default by using
+From 9cd0feeb36e835dbc9f394befd32e02ec1ce6841 Mon Sep 17 00:00:00 2001
+From: Jamie Strandboge <jamie@canonical.com>
+Date: Thu, 8 Oct 2015 13:19:47 -0700
+Subject: 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-09-01
+Patch-Name: 02_require-cert-verification.patch
+---
+ urllib3/connectionpool.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/urllib3/connectionpool.py b/urllib3/connectionpool.py
+index 0750e24..fe2f546 100644
--- a/urllib3/connectionpool.py
+++ b/urllib3/connectionpool.py
-@@ -628,6 +628,8 @@
+@@ -679,6 +679,8 @@ class HTTPSConnectionPool(HTTPConnectionPool):
``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 +26,7 @@ Last-Update: 2014-09-01
"""
scheme = 'https'
-@@ -637,8 +639,8 @@
+@@ -688,8 +690,8 @@ class HTTPSConnectionPool(HTTPConnectionPool):
strict=False, timeout=Timeout.DEFAULT_TIMEOUT, maxsize=1,
block=False, headers=None, retries=None,
_proxy=None, _proxy_headers=None,