1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
Description: Use system ca certificates, not the bundled ones
Author: Marc Deslauriers <marc.deslauriers@canonical.com>
Forwarded: No, distro-specific
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-httplib2/+bug/882027
Index: python-httplib2-0.7.2/python2/httplib2/__init__.py
===================================================================
--- python-httplib2-0.7.2.orig/python2/httplib2/__init__.py 2011-11-14 12:37:38.000000000 -0500
+++ python-httplib2-0.7.2/python2/httplib2/__init__.py 2011-12-15 14:21:42.061709438 -0500
@@ -180,9 +180,8 @@
# requesting that URI again.
DEFAULT_MAX_REDIRECTS = 5
-# Default CA certificates file bundled with httplib2.
-CA_CERTS = os.path.join(
- os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
+# Use system CA certificates
+CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"
# Which headers are hop-by-hop headers by default
HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
Index: python-httplib2-0.7.2/python3/httplib2/__init__.py
===================================================================
--- python-httplib2-0.7.2.orig/python3/httplib2/__init__.py 2011-11-14 12:37:38.000000000 -0500
+++ python-httplib2-0.7.2/python3/httplib2/__init__.py 2011-12-15 14:22:02.937709977 -0500
@@ -119,9 +119,8 @@
# Which headers are hop-by-hop headers by default
HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
-# Default CA certificates file bundled with httplib2.
-CA_CERTS = os.path.join(
- os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
+# Use system CA certificates
+CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"
def _get_end2end_headers(response):
hopbyhop = list(HOP_BY_HOP)
|
