Mercurial > hg
comparison mercurial/url.py @ 13164:b75fc70f0a9f
merge with stable
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Sat, 18 Dec 2010 22:06:11 +0100 |
| parents | bda5f35fbf67 2fa2e6444645 |
| children | 04c8f3787546 |
comparison
equal
deleted
inserted
replaced
| 13162:115a9760c382 | 13164:b75fc70f0a9f |
|---|---|
| 543 raise util.Abort(_('%s certificate error: %s') % | 543 raise util.Abort(_('%s certificate error: %s') % |
| 544 (self.host, msg)) | 544 (self.host, msg)) |
| 545 self.ui.debug('%s certificate successfully verified\n' % | 545 self.ui.debug('%s certificate successfully verified\n' % |
| 546 self.host) | 546 self.host) |
| 547 else: | 547 else: |
| 548 self.ui.warn(_("warning: %s certificate not verified " | |
| 549 "(check web.cacerts config setting)\n") % | |
| 550 self.host) | |
| 548 httplib.HTTPSConnection.connect(self) | 551 httplib.HTTPSConnection.connect(self) |
| 549 | 552 |
| 550 class httpsconnection(BetterHTTPS): | 553 class httpsconnection(BetterHTTPS): |
| 551 response_class = keepalive.HTTPResponse | 554 response_class = keepalive.HTTPResponse |
| 552 # must be able to send big bundle as stream. | 555 # must be able to send big bundle as stream. |