diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-02-13 23:48:05 +0100 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-02-13 23:48:05 +0100 |
| commit | 525306c1e2930c6b378b0a4e9fb92eeb90865b0a (patch) | |
| tree | 790f22f18cc999de67fbcaa8de691c843898730e /apps/media | |
| parent | 29fc82c364e2e90330d9858528e50d785e5e66bd (diff) | |
| download | nextcloud-server-525306c1e2930c6b378b0a4e9fb92eeb90865b0a.tar.gz nextcloud-server-525306c1e2930c6b378b0a4e9fb92eeb90865b0a.zip | |
Replace Expires and caching headers by OC_Response functions
Diffstat (limited to 'apps/media')
| -rw-r--r-- | apps/media/ajax/api.php | 13 | ||||
| -rw-r--r-- | apps/media/tomahawk.php | 4 |
2 files changed, 4 insertions, 13 deletions
diff --git a/apps/media/ajax/api.php b/apps/media/ajax/api.php index ac6739a1386..bb4502690b5 100644 --- a/apps/media/ajax/api.php +++ b/apps/media/ajax/api.php @@ -111,18 +111,11 @@ if($arguments['action']){ OC_MEDIA_COLLECTION::registerPlay($songId); header('Content-Type:'.$ftype); - // calc an offset of 24 hours - $offset = 3600 * 24; - // calc the string in GMT not localtime and add the offset - $expire = "Expires: " . gmdate("D, d M Y H:i:s", time() + $offset) . " GMT"; - //output the HTTP header - header($expire); - header('Cache-Control: max-age=3600, must-revalidate'); - header('Pragma: public'); + OC_Response::enableCaching(3600 * 24); // 24 hour header('Accept-Ranges: bytes'); header('Content-Length: '.OC_Filesystem::filesize($arguments['path'])); - $gmt_mtime = gmdate('D, d M Y H:i:s', OC_Filesystem::filemtime($arguments['path']) ) . ' GMT'; - header("Last-Modified: " . $gmt_mtime ); + $mtime = OC_Filesystem::filemtime($arguments['path']); + OC_Response::setLastModifiedHeader($mtime); OC_Filesystem::readfile($arguments['path']); exit; diff --git a/apps/media/tomahawk.php b/apps/media/tomahawk.php index 68401db67ae..6dd41233f12 100644 --- a/apps/media/tomahawk.php +++ b/apps/media/tomahawk.php @@ -43,9 +43,7 @@ if(isset($_POST['play']) and $_POST['play']=='true'){ $song=OC_MEDIA_COLLECTION::getSong($_POST['song']); $ftype=OC_Filesystem::getMimeType( $song['song_path'] ); header('Content-Type:'.$ftype); - header('Expires: 0'); - header('Cache-Control: must-revalidate, post-check=0, pre-check=0'); - header('Pragma: public'); + OC_Response::disableCaching(); header('Content-Length: '.OC_Filesystem::filesize($song['song_path'])); OC_Filesystem::readfile($song['song_path']); |