mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
Merge pull request #1230 from oddnoc/3.1-restfulservice-error-check
BUG: Fetch curl_error in RestfulService
This commit is contained in:
commit
b90e0c0955
@ -299,7 +299,7 @@ class RestfulService extends ViewableData {
|
|||||||
//get the status code
|
//get the status code
|
||||||
$statusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
|
$statusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
|
||||||
//normalise the status code
|
//normalise the status code
|
||||||
if($curlError !== '' || $statusCode == 0) $statusCode = 500;
|
if(curl_error($ch) !== '' || $statusCode == 0) $statusCode = 500;
|
||||||
//calculate the length of the header and extract it
|
//calculate the length of the header and extract it
|
||||||
$headerLength = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
|
$headerLength = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
|
||||||
$rawHeaders = substr($rawResponse, 0, $headerLength);
|
$rawHeaders = substr($rawResponse, 0, $headerLength);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user