Merge branch 'master' into master

This commit is contained in:
Rambone
2016-06-21 21:30:09 -05:00
committed by GitHub
+2
View File
@@ -56,6 +56,7 @@ class Curl
public $httpStatusCode = 0;
public $httpErrorMessage = null;
public $totalTime = 0;
public $baseUrl = null;
public $url = null;
public $effectiveUrl = null;
@@ -348,6 +349,7 @@ class Curl
$this->curlErrorMessage = curl_error($this->curl);
$this->curlError = !($this->curlErrorCode === 0);
$this->httpStatusCode = curl_getinfo($this->curl, CURLINFO_HTTP_CODE);
$this->totalTime = curl_getinfo($this->curl, CURLINFO_TOTAL_TIME);
$this->httpError = in_array(floor($this->httpStatusCode / 100), array(4, 5));
$this->error = $this->curlError || $this->httpError;
$this->errorCode = $this->error ? ($this->curlError ? $this->curlErrorCode : $this->httpStatusCode) : 0;