Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.5.x' into 2.5.x-saas

This commit is contained in:
drigato 2014-01-29 12:13:24 -05:00
parent a0cae1d8f3 7a04f7d98e
commit 719d582e0f
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
airtime_mvc/application/models/Webstream.php
View File

@ -360,21 +360,27 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
private static function discoverStreamMime($url)
{
//TODO: What if invalid URL?
$headers = get_headers($url);
try {
$headers = @get_headers($url);
$headers = self::cleanHeaders($headers);
$mime = null;
$content_length_found = false;
foreach ($headers as $h) {
if (preg_match("/^content-type:/i", $h)) {
list(, $value) = explode(":", $h, 2);
$mime = trim($value);
}
if (preg_match("/^content-length:/i", $h)) {
$content_length_found = true;
$mime = null;
$content_length_found = false;
if ($headers !== false) {
$headers = self::cleanHeaders($headers);
foreach ($headers as $h) {
if (preg_match("/^content-type:/i", $h)) {
list(, $value) = explode(":", $h, 2);
$mime = trim($value);
}
if (preg_match("/^content-length:/i", $h)) {
$content_length_found = true;
}
}
}
} catch (Exception $e) {
Logging::info("Invalid stream URL");
Logging::info($e->getMessage());
}
return array($mime, $content_length_found);