Fix coding standard violations

cakephp · Jun 12, 2014 · 3615315 · 3615315
1 parent 86923e3
commit 3615315
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/lib/Cake/Network/CakeSocket.php b/lib/Cake/Network/CakeSocket.php
@@ -131,8 +131,8 @@ public function connect() {
 		}
 
 		$scheme = null;
-		if (!empty($this->config['protocol']) &&  strpos($this->config['host'], '://') === false)  {
-			$scheme = $this->config['protocol'].'://';
+		if (!empty($this->config['protocol']) && strpos($this->config['host'], '://') === false) {
+			$scheme = $this->config['protocol'] . '://';
 		}
 
 		if (!empty($this->config['context'])) {

diff --git a/lib/Cake/Network/Http/HttpSocket.php b/lib/Cake/Network/Http/HttpSocket.php
@@ -341,8 +341,8 @@ 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'){
-			$this->config['protocol'] = 'ssl'; 
+		if (isset($this->request['uri']['scheme']) && $this->request['uri']['scheme'] === 'https' && empty($this->config['protocol'])) {
+			$this->config['protocol'] = 'ssl';
 		}
 
 		$connectionType = null;
@@ -525,7 +525,7 @@ public function delete($uri = null, $data = array(), $request = array()) {
 	}
 
 /**
- * Issues a HEADER request to the specified URI, query, and request.
+ * Issues a HEAD request to the specified URI, query, and request.
  *
  * @param string|array $uri URI to request (see {@link _parseUri()})
  * @param array $data Array of request body data keys and values.
@@ -537,8 +537,6 @@ public function head($uri = null, $data = array(), $request = array()) {
 		return $this->request($request);
 	}
 
-
-
 /**
  * Normalizes URLs into a $uriTemplate. If no template is provided
  * a default one will be used. Will generate the URL using the