valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass error code along if geturl fails

This commit is contained in:
Rob Hoelz 2013-05-29 20:50:27 +02:00
parent 642432fc39
commit e2b4c0b70c
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/functions.php
View File

@ -317,7 +317,12 @@
$fetch_curl_used = true; $fetch_curl_used = true;
if (ini_get("safe_mode") || ini_get("open_basedir")) { if (ini_get("safe_mode") || ini_get("open_basedir")) {
$ch = curl_init(geturl($url)); $new_url = geturl($url);
if (!$new_url) {
// geturl has already populated $fetch_last_error
return false;
}
$ch = curl_init($new_url);
} else { } else {
$ch = curl_init($url); $ch = curl_init($url);
} }
@ -4100,10 +4105,10 @@
$html = curl_exec($curl); $html = curl_exec($curl);
$status = curl_getinfo($curl); $status = curl_getinfo($curl);
curl_close($curl);
if($status['http_code']!=200){ if($status['http_code']!=200){
if($status['http_code'] == 301 || $status['http_code'] == 302) { if($status['http_code'] == 301 || $status['http_code'] == 302) {
curl_close($curl);
list($header) = explode("\r\n\r\n", $html, 2); list($header) = explode("\r\n\r\n", $html, 2);
$matches = array(); $matches = array();
preg_match("/(Location:|URI:)[^(\n)]*/", $header, $matches); preg_match("/(Location:|URI:)[^(\n)]*/", $header, $matches);
@ -4111,6 +4116,12 @@
$url_parsed = parse_url($url); $url_parsed = parse_url($url);
return (isset($url_parsed))? geturl($url):''; return (isset($url_parsed))? geturl($url):'';
} }
global $fetch_last_error;
$fetch_last_error = curl_errno($curl) . " " . curl_error($curl);
curl_close($curl);
$oline=''; $oline='';
foreach($status as $key=>$eline){$oline.='['.$key.']'.$eline.' ';} foreach($status as $key=>$eline){$oline.='['.$key.']'.$eline.' ';}
$line =$oline." \r\n ".$url."\r\n-----------------\r\n"; $line =$oline." \r\n ".$url."\r\n-----------------\r\n";
@ -4118,6 +4129,7 @@
# fwrite($handle, $line); # fwrite($handle, $line);
return FALSE; return FALSE;
} }
curl_close($curl);
return $url; return $url;
} }