Merge pull request #2856 from cvandeplas/master

fixes issue #2855 where cafile is not set in HttpSocket
This commit is contained in:
Mark Story 2014-02-21 22:29:35 -05:00
commit 97ebfd6341

View file

@ -684,7 +684,7 @@ class HttpSocket extends CakeSocket {
} }
unset($this->config[$key]); unset($this->config[$key]);
} }
if (empty($this->_context['ssl']['cafile'])) { if (empty($this->config['context']['ssl']['cafile'])) {
$this->config['context']['ssl']['cafile'] = CAKE . 'Config' . DS . 'cacert.pem'; $this->config['context']['ssl']['cafile'] = CAKE . 'Config' . DS . 'cacert.pem';
} }
if (!empty($this->config['context']['ssl']['verify_host'])) { if (!empty($this->config['context']['ssl']['verify_host'])) {