Merge branch 'fix-sni' into 2.7

Refs #7675
This commit is contained in:
mark_story 2015-11-11 22:53:08 -05:00
commit 7cc163d9b8

View file

@ -134,7 +134,12 @@ class CakeSocket {
$scheme = $this->config['protocol'] . '://';
}
$this->_setSslContext($this->config['host']);
$host = $this->config['host'];
if (isset($this->config['request']['uri']['host'])) {
$host = $this->config['request']['uri']['host'];
}
$this->_setSslContext($host);
if (!empty($this->config['context'])) {
$context = stream_context_create($this->config['context']);
} else {