From 08dfd82710b53d27d1b4dfea9b0849300b6b3607 Mon Sep 17 00:00:00 2001 From: Franzz Date: Sat, 2 Nov 2019 21:40:41 +0100 Subject: [PATCH] Fix curl error catching --- inc/toolbox.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/inc/toolbox.php b/inc/toolbox.php index 9e444b2..4737446 100755 --- a/inc/toolbox.php +++ b/inc/toolbox.php @@ -148,10 +148,12 @@ class ToolBox if($sCreds!='') curl_setopt($oCurl, CURLOPT_USERPWD, $sCreds); $sContent = curl_exec($oCurl); - - $bSuccess = ($sContent!==false); + + $sCurlErrorId = curl_errno($oCurl); + $sHttpCode = curl_getinfo($oCurl, CURLINFO_HTTP_CODE); + $bSuccess = ($sCurlErrorId==0 && $sHttpCode==200); $sDesc = ''; - if(!$bSuccess) $sDesc = curl_errno($oCurl).': '.curl_strerror(curl_errno($oCurl)); + if(!$bSuccess) $sDesc = ($sCurlErrorId==0)?('HTTP Error Code '.$sHttpCode):($sCurlErrorId.': '.curl_strerror($sCurlErrorId)); curl_close($oCurl); switch($sReturnType) {