vitalif
/
FeedOnFeeds
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

favicon patches

orig_fof
steveminutillo 2007-06-05 02:45:21 +00:00
parent acf373d0b8
commit eeba90fdb1
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
simplepie/simplepie.inc
View File

@ -1789,7 +1789,7 @@ function embed_wmedia(width, height, link) {
{ {
$file =& new $this->file_class($favicon, $this->timeout/10, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen); $file =& new $this->file_class($favicon, $this->timeout/10, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen);
if ($file->success && ($file->status_code == 200 || ($file->status_code > 206 && $file->status_code < 300))) if ($file->success && ($file->status_code == 200 || ($file->status_code > 206 && $file->status_code < 300)) && strlen($file->body) > 0)
{ {
if ($this->favicon_handler) if ($this->favicon_handler)
{ {
@ -1819,20 +1819,26 @@ function embed_wmedia(width, height, link) {
if (isset($m[2][0]) && !empty($m[0][0]) && $m[2][0] != $standard_favicon) if (isset($m[2][0]) && !empty($m[0][0]) && $m[2][0] != $standard_favicon)
{ {
unset($file); unset($file);
$file =& new $this->file_class($m[2][0], $this->timeout/10, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen); $favicon = SimplePie_Misc::absolutize_url($m[2][0], $this->get_link());
$file =& new $this->file_class($favicon, $this->timeout/10, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen);
if ($this->favicon_handler) if ($file->success && ($file->status_code == 200 || ($file->status_code > 206 && $file->status_code < 300)) && strlen($file->body) > 0)
{ {
if ($cache->save(array('headers' => $file->headers, 'body' => $file->body))) if ($this->favicon_handler)
{ {
return $this->favicon_handler . $favicon; $cache =& new $this->cache_class($this->cache_location, call_user_func($this->cache_name_function, $favicon), 'spi');
}
else if ($cache->save(array('headers' => $file->headers, 'body' => $file->body)))
{ {
trigger_error("$cache->name is not writeable", E_USER_WARNING); return $this->favicon_handler . $favicon;
}
else
{
trigger_error("$cache->name is not writeable", E_USER_WARNING);
}
} }
return $favicon;
} }
return $m[2][0];
} }
} }
} }
@ -6377,11 +6383,11 @@ class SimplePie_File
curl_setopt($fp, CURLOPT_MAXREDIRS, $redirects); curl_setopt($fp, CURLOPT_MAXREDIRS, $redirects);
} }
$this->headers = trim(curl_exec($fp)); $this->headers = curl_exec($fp);
if (curl_errno($fp) == 23 || curl_errno($fp) == 61) if (curl_errno($fp) == 23 || curl_errno($fp) == 61)
{ {
curl_setopt($fp, CURLOPT_ENCODING, 'none'); curl_setopt($fp, CURLOPT_ENCODING, 'none');
$this->headers = trim(curl_exec($fp)); $this->headers = curl_exec($fp);
} }
if (curl_errno($fp)) if (curl_errno($fp))
{ {
@ -10257,4 +10263,4 @@ class SimplePie_Sanitize
} }
} }
?> ?>