| 1 |
Description: Use system ca certificates, not the bundled ones
|
| 2 |
Author: Marc Deslauriers <marc.deslauriers@canonical.com>
|
| 3 |
Forwarded: not-needed
|
| 4 |
Bug-Ubuntu: https://launchpad.net/bugs/882027
|
| 5 |
|
| 6 |
Index: b/python2/httplib2/__init__.py
|
| 7 |
===================================================================
|
| 8 |
--- a/python2/httplib2/__init__.py 2013-03-18 22:37:43.423868573 +0100
|
| 9 |
+++ b/python2/httplib2/__init__.py 2013-03-18 22:37:43.419868572 +0100
|
| 10 |
@@ -190,9 +190,8 @@
|
| 11 |
import ca_certs_locater
|
| 12 |
CA_CERTS = ca_certs_locater.get()
|
| 13 |
except ImportError:
|
| 14 |
- # Default CA certificates file bundled with httplib2.
|
| 15 |
- CA_CERTS = os.path.join(
|
| 16 |
- os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
|
| 17 |
+ # Use system CA certificates
|
| 18 |
+ CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"
|
| 19 |
|
| 20 |
# Which headers are hop-by-hop headers by default
|
| 21 |
HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
|
| 22 |
Index: b/python3/httplib2/__init__.py
|
| 23 |
===================================================================
|
| 24 |
--- a/python3/httplib2/__init__.py 2013-03-18 22:37:43.423868573 +0100
|
| 25 |
+++ b/python3/httplib2/__init__.py 2013-03-18 22:37:43.419868572 +0100
|
| 26 |
@@ -123,9 +123,8 @@
|
| 27 |
# Which headers are hop-by-hop headers by default
|
| 28 |
HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
|
| 29 |
|
| 30 |
-# Default CA certificates file bundled with httplib2.
|
| 31 |
-CA_CERTS = os.path.join(
|
| 32 |
- os.path.dirname(os.path.abspath(__file__ )), "cacerts.txt")
|
| 33 |
+# Use system CA certificates
|
| 34 |
+CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"
|
| 35 |
|
| 36 |
def _get_end2end_headers(response):
|
| 37 |
hopbyhop = list(HOP_BY_HOP)
|
| 38 |
Index: b/setup.py
|
| 39 |
===================================================================
|
| 40 |
--- a/setup.py 2013-03-18 22:37:43.423868573 +0100
|
| 41 |
+++ b/setup.py 2013-03-18 22:37:43.419868572 +0100
|
| 42 |
@@ -61,7 +61,6 @@
|
| 43 |
""",
|
| 44 |
package_dir=pkgdir,
|
| 45 |
packages=['httplib2'],
|
| 46 |
- package_data={'httplib2': ['*.txt']},
|
| 47 |
classifiers=[
|
| 48 |
'Development Status :: 4 - Beta',
|
| 49 |
'Environment :: Web Environment',
|
Parent Directory
| 
Revision Log