Bazaar

Merge lp:~gz/bzr/trivial_win32_cert_bundle_name into lp:bzr/2.5

  1. trivial_win32_cert_bundle_name
  2. Merge into 2.5
Proposed by Martin Packman
Status: Merged
Approved by: Vincent Ladeuil
Approved revision: no longer in the source branch.
Merged at revision: 6478
Proposed branch: lp:~gz/bzr/trivial_win32_cert_bundle_name
Merge into: lp:bzr/2.5
Diff against target: 12 lines (+1/-1)
1 file modified
bzrlib/transport/http/_urllib2_wrappers.py (+1/-1)
To merge this branch: bzr merge lp:~gz/bzr/trivial_win32_cert_bundle_name
Reviewer Review Type Date Requested Status
Vincent Ladeuil Approve
Review via email: mp+93996@code.launchpad.net

Commit message

Use 'cacert.pem' as name for default certificate bundle on win32

Description of the change

Use the filename the curl website seems to prefer these days for its certificate bundle as the windows default. Has the bonus of .pem not being a registered extension on winxp unlike .crt which is used for individual certs. Double clicking on the .crt named bundle is confusing because windows displays information about the first certificate only.

To post a comment you must log in.
Revision history for this message
Vincent Ladeuil (vila) :
review: Approve
Revision history for this message
Martin Packman (gz) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/transport/http/_urllib2_wrappers.py'
2--- bzrlib/transport/http/_urllib2_wrappers.py 2012-02-15 10:24:06 +0000
3+++ bzrlib/transport/http/_urllib2_wrappers.py 2012-02-21 14:16:06 +0000
4@@ -88,7 +88,7 @@
5 ]
6 def default_ca_certs():
7 if sys.platform == 'win32':
8- return os.path.join(os.path.dirname(sys.executable), u"ca_bundle.crt")
9+ return os.path.join(os.path.dirname(sys.executable), u"cacert.pem")
10 elif sys.platform == 'darwin':
11 # FIXME: Needs some default value for osx, waiting for osx installers
12 # guys feedback -- vila 2012-01-25

Subscribers

People subscribed via source and target branches