Skip to content
Permalink
Browse files

Fix coding standard violations

  • Loading branch information...
MelvinRoss committed Jun 12, 2014
1 parent 86923e3 commit 361531509e3e7f1f67fe6811b9c36a0b3abd161c
Showing with 5 additions and 7 deletions.
  1. +2 −2 lib/Cake/Network/CakeSocket.php
  2. +3 −5 lib/Cake/Network/Http/HttpSocket.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'])) {
@@ -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

0 comments on commit 3615315

Please sign in to comment.
You can’t perform that action at this time.