Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1410)

Unified Diff: third_party/boto/boto/https_connection.py

Issue 698893003: Update checked in version of gsutil to version 4.6 (Closed) Base URL: http://dart.googlecode.com/svn/third_party/gsutil/
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/boto/boto/gs/user.py ('k') | third_party/boto/boto/iam/__init__.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/boto/boto/https_connection.py
===================================================================
--- third_party/boto/boto/https_connection.py (revision 33376)
+++ third_party/boto/boto/https_connection.py (working copy)
@@ -109,8 +109,12 @@
if hasattr(self, "timeout") and self.timeout is not socket._GLOBAL_DEFAULT_TIMEOUT:
sock.settimeout(self.timeout)
sock.connect((self.host, self.port))
- boto.log.debug("wrapping ssl socket; CA certificate file=%s",
- self.ca_certs)
+ msg = "wrapping ssl socket; "
+ if self.ca_certs:
+ msg += "CA certificate file=%s" %self.ca_certs
+ else:
+ msg += "using system provided SSL certs"
+ boto.log.debug(msg)
self.sock = ssl.wrap_socket(sock, keyfile=self.key_file,
certfile=self.cert_file,
cert_reqs=ssl.CERT_REQUIRED,
« no previous file with comments | « third_party/boto/boto/gs/user.py ('k') | third_party/boto/boto/iam/__init__.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698