Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed double sending of headers problem with S3 cache

This commit is contained in:
Albert Santoni 2015-04-01 17:29:21 -04:00
parent 9b85fc59a6
commit 3e2cd54be7
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
airtime_mvc/application/common/FileIO.php
View File

@ -63,9 +63,6 @@ class Application_Common_FileIO
} }
} }
//Squashes headers() warning on PHP 5.3/ubuntu 12.04:
flush();
//We can have multiple levels of output buffering. Need to //We can have multiple levels of output buffering. Need to
//keep looping until all have been disabled!!! //keep looping until all have been disabled!!!
//http://www.php.net/manual/en/function.ob-end-flush.php //http://www.php.net/manual/en/function.ob-end-flush.php

1
airtime_mvc/application/services/MediaService.php
View File

@ -93,6 +93,7 @@ class Application_Service_MediaService
$size= $media->getFileSize(); $size= $media->getFileSize();
$mimeType = $media->getPropelOrm()->getDbMime(); $mimeType = $media->getPropelOrm()->getDbMime();
Application_Common_FileIO::smartReadFile($filePath, $size, $mimeType); Application_Common_FileIO::smartReadFile($filePath, $size, $mimeType);
break; //Break out of the loop if we successfully read the file!
} catch (FileNotFoundException $e) { } catch (FileNotFoundException $e) {
//If we have no alternate filepaths left, then let the exception bubble up. //If we have no alternate filepaths left, then let the exception bubble up.
if (sizeof($filePaths) == 0) { if (sizeof($filePaths) == 0) {