Fix: Correction de bugs dans magpierss qui ne renvoie pas d'erreurs si echec cration socket. Je fix et marque dans source magpierss par "LDR FIX BUG".

This commit is contained in:
Laurent Destailleur 2005-04-30 17:12:29 +00:00
parent 3bc5a9ff8f
commit d3337f36f0

View File

@ -94,7 +94,7 @@ function fetch_rss ($url) {
error("fetch_rss called without a url");
return false;
}
// if cache is disabled
if ( !MAGPIE_CACHE_ON ) {
// fetch file, and parse it
@ -158,7 +158,7 @@ function fetch_rss ($url) {
}
$resp = _fetch_remote_file( $url, $request_headers );
if (isset($resp) and $resp) {
if ($resp->status == '304' ) {
// we have the most current copy
@ -185,12 +185,18 @@ function fetch_rss ($url) {
if ( $resp->error ) {
# compensate for Snoopy's annoying habbit to tacking
# on '\n'
$http_error = substr($resp->error, 0, -2);
// LDR FIX BUG
$http_error = eregi_replace("\n","",$resp->error);
$errormsg .= "(HTTP Error: $http_error)";
}
else {
$errormsg .= "(HTTP Response: " . $resp->response_code .')';
}
// LDR FIX BUG Si echec recup http mais cache bien lu, on stock erreur dans object rss
if ($rss) $rss->ERROR=$errormsg;
}
}
else {
@ -206,7 +212,7 @@ function fetch_rss ($url) {
}
return $rss;
}
// else we totally failed
error( $errormsg );
@ -268,7 +274,7 @@ function _fetch_remote_file ($url, $headers = "" ) {
if (is_array($headers) ) {
$client->rawheaders = $headers;
}
@$client->fetch($url);
return $client;