Mirrors/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2024-08-29 17:54:44 +02:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

Merge pull request #8366 from nextcloud/remove-disable-caching-headers

Browse Source 
Use normal header() calls instead of private method calls
This commit is contained in:
Roeland Jago Douma 2018-02-19 10:40:45 +01:00 committed by GitHub
commit 9c33ebad5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files/download.php
View File

@ -41,7 +41,9 @@ $ftype=\OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesyst
header('Content-Type:'.$ftype); header('Content-Type:'.$ftype);
OCP\Response::setContentDispositionHeader(basename($filename), 'attachment'); OCP\Response::setContentDispositionHeader(basename($filename), 'attachment');
OCP\Response::disableCaching(); header('Pragma: public');// enable caching in IE
header('Expires: 0');
header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
OCP\Response::setContentLengthHeader(\OC\Files\Filesystem::filesize($filename)); OCP\Response::setContentLengthHeader(\OC\Files\Filesystem::filesize($filename));
OC_Util::obEnd(); OC_Util::obEnd();

4
apps/files_versions/download.php
View File

@ -49,7 +49,9 @@ $ftype = \OC::$server->getMimeTypeDetector()->getSecureMimeType($view->getMimeTy
header('Content-Type:'.$ftype); header('Content-Type:'.$ftype);
OCP\Response::setContentDispositionHeader(basename($filename), 'attachment'); OCP\Response::setContentDispositionHeader(basename($filename), 'attachment');
OCP\Response::disableCaching(); header('Pragma: public');// enable caching in IE
header('Expires: 0');
header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
OCP\Response::setContentLengthHeader($view->filesize($versionName)); OCP\Response::setContentLengthHeader($view->filesize($versionName));
OC_Util::obEnd(); OC_Util::obEnd();

2
lib/private/App/CodeChecker/DeprecationCheck.php
View File

@ -146,6 +146,8 @@ class DeprecationCheck extends AbstractCheck {
'OCP\IServerContainer::getDb' => '8.1.0', 'OCP\IServerContainer::getDb' => '8.1.0',
'OCP\IServerContainer::getHTTPHelper' => '8.1.0', 'OCP\IServerContainer::getHTTPHelper' => '8.1.0',
'OCP\Response::disableCaching' => '14.0.0',
'OCP\User::getUser' => '8.0.0', 'OCP\User::getUser' => '8.0.0',
'OCP\User::getUsers' => '8.1.0', 'OCP\User::getUsers' => '8.1.0',
'OCP\User::getDisplayName' => '8.1.0', 'OCP\User::getDisplayName' => '8.1.0',

4
lib/private/legacy/files.php
View File

@ -75,7 +75,9 @@ class OC_Files {
private static function sendHeaders($filename, $name, array $rangeArray) { private static function sendHeaders($filename, $name, array $rangeArray) {
OC_Response::setContentDispositionHeader($name, 'attachment'); OC_Response::setContentDispositionHeader($name, 'attachment');
header('Content-Transfer-Encoding: binary', true); header('Content-Transfer-Encoding: binary', true);
OC_Response::disableCaching(); header('Pragma: public');// enable caching in IE
header('Expires: 0');
header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
$fileSize = \OC\Files\Filesystem::filesize($filename); $fileSize = \OC\Files\Filesystem::filesize($filename);
$type = \OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType($filename)); $type = \OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType($filename));
if ($fileSize > -1) { if ($fileSize > -1) {

10
lib/private/legacy/response.php
View File

@ -55,7 +55,7 @@ class OC_Response {
header('Cache-Control: max-age='.$cache_time.', must-revalidate'); header('Cache-Control: max-age='.$cache_time.', must-revalidate');
} }
else { else {
self::setExpiresHeader(0); header('Expires: 0');
header("Cache-Control: must-revalidate, post-check=0, pre-check=0"); header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
} }
} }
@ -66,14 +66,6 @@ class OC_Response {
} }
/**
* disable browser caching
* @see enableCaching with cache_time = 0
*/
static public function disableCaching() {
self::enableCaching(0);
}
/** /**
* Set response status * Set response status
* @param int $status a HTTP status code, see also the STATUS constants * @param int $status a HTTP status code, see also the STATUS constants

5
lib/public/Response.php
View File

@ -89,9 +89,12 @@ class Response {
* Disable browser caching * Disable browser caching
* @see enableCaching with cache_time = 0 * @see enableCaching with cache_time = 0
* @since 4.0.0 * @since 4.0.0
* @deprecated 14.0.0 just set the headers
*/ */
static public function disableCaching() { static public function disableCaching() {
\OC_Response::disableCaching(); header('Pragma: public');// enable caching in IE
header('Expires: 0');
header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
} }
/** /**