← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/http/_urllib2_wrappers.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-20 02:13:35 UTC
  • mto: (6437.3.18 2.5)
  • mto: This revision was merged to the branch mainline in revision 6444.
  • Revision ID: jelmer@samba.org-20111220021335-c436olw04sy8s00w
Add ssl.ca_certificates setting.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/_urllib2_wrappers.py
389
389
            self.connect_to_origin()
390
390
 
391
391
    def connect_to_origin(self):
 
392
        global_config = config.GlobalStack()
 
393
        ca_certs = global_config.get('ssl.ca_certs')
392
394
        ssl_sock = ssl.wrap_socket(self.sock, self.key_file, self.cert_file,
393
395
            cert_reqs=ssl.CERT_REQUIRED,
394
 
            ca_certs="/etc/ssl/certs/ca-certificates.crt")
 
396
            ca_certs=ca_certs)
395
397
        match_hostname(ssl_sock.getpeercert(), self.host)
396
398
 
397
399
        # Wrap the ssl socket before anybody use it