diff options
author | Brion Vibber <brion@pobox.com> | 2010-05-21 13:12:25 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-05-21 13:12:25 -0700 |
commit | 87b8a89aa7b96e63586bdd3b1afb9d43355fd48b (patch) | |
tree | ef227ad50cd25699d34dd1a3364ac0cf430443da /lib/httpclient.php | |
parent | a39a934dd4a133bad6e76fa9a5018cedcb70225c (diff) | |
parent | bbfd6eff0c69f038d151d3bf6c8bf9b45a64716f (diff) |
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'lib/httpclient.php')
-rw-r--r-- | lib/httpclient.php | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/lib/httpclient.php b/lib/httpclient.php index 384626ae0..b69f718e5 100644 --- a/lib/httpclient.php +++ b/lib/httpclient.php @@ -132,7 +132,19 @@ class HTTPClient extends HTTP_Request2 // ought to be investigated to see if we can handle // it gracefully in that case as well. $this->config['protocol_version'] = '1.0'; - + + // Default state of OpenSSL seems to have no trusted + // SSL certificate authorities, which breaks hostname + // verification and means we have a hard time communicating + // with other sites' HTTPS interfaces. + // + // Turn off verification unless we've configured a CA bundle. + if (common_config('http', 'ssl_cafile')) { + $this->config['ssl_cafile'] = common_config('http', 'ssl_cafile'); + } else { + $this->config['ssl_verify_peer'] = false; + } + parent::__construct($url, $method, $config); $this->setHeader('User-Agent', $this->userAgent()); } |