Fix HttpSocket test to actually reset protocols for correct test. Mod…

…ify HttpSocket so that Https with non-passed in protocol doesn't set it to tcp and fail test.
cakephp · Jun 12, 2014 · ad4dbdc · ad4dbdc
1 parent 460cc29
commit ad4dbdc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/Cake/Network/Http/HttpSocket.php b/lib/Cake/Network/Http/HttpSocket.php
@@ -341,7 +341,7 @@ public function request($request = array()) {
 		if (!empty($this->request['body']) && !isset($this->request['header']['Content-Length'])) {
 			$this->request['header']['Content-Length'] = strlen($this->request['body']);
 		}
-		if (isset($this->request['uri']['scheme']) && $this->request['uri']['scheme'] === 'https' && empty($this->config['protocol'])) {
+		if (isset($this->request['uri']['scheme']) && $this->request['uri']['scheme'] === 'https' && in_array($this->config['protocol'], array(false, 'tcp'))) {
 			$this->config['protocol'] = 'ssl';
 		}
 

diff --git a/lib/Cake/Test/Case/Network/Http/HttpSocketTest.php b/lib/Cake/Test/Case/Network/Http/HttpSocketTest.php
@@ -493,7 +493,7 @@ public function testRequest() {
 					)
 				)
 			),
-			'reset9' => array(
+			'reset10' => array(
 				'config.protocol' => 'ssl'
 			),
 			array(
@@ -524,6 +524,9 @@ public function testRequest() {
 					)
 				)
 			),
+			'reset11' => array(
+				'config.protocol' => 'ssl'
+			),
 			array(
 				'request' => array(
 					'method' => 'POST',