Fixed double sending of headers problem with S3 cache
This commit is contained in:
parent
9b85fc59a6
commit
3e2cd54be7
|
@ -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
|
||||
//keep looping until all have been disabled!!!
|
||||
//http://www.php.net/manual/en/function.ob-end-flush.php
|
||||
|
|
|
@ -93,6 +93,7 @@ class Application_Service_MediaService
|
|||
$size= $media->getFileSize();
|
||||
$mimeType = $media->getPropelOrm()->getDbMime();
|
||||
Application_Common_FileIO::smartReadFile($filePath, $size, $mimeType);
|
||||
break; //Break out of the loop if we successfully read the file!
|
||||
} catch (FileNotFoundException $e) {
|
||||
//If we have no alternate filepaths left, then let the exception bubble up.
|
||||
if (sizeof($filePaths) == 0) {
|
||||
|
|
Loading…
Reference in New Issue