mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3000 from nextcloud/cache-no-store 

set 'no-store' cache header if we do not want FF to cache
This commit is contained in:
Roeland Jago Douma 2017-01-10 14:07:13 +01:00 committed by GitHub
parent 4dd2a1e679 45c6301772
commit aee11009bd
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/public/AppFramework/Http/Response.php
View File

@ -43,11 +43,11 @@ use OCP\AppFramework\Http;
class Response {
/**
* Headers - defaults to ['Cache-Control' => 'no-cache, must-revalidate']
* Headers - defaults to ['Cache-Control' => 'no-cache, no-store, must-revalidate']
* @var array
*/
private $headers = array(
'Cache-Control' => 'no-cache, must-revalidate'
'Cache-Control' => 'no-cache, no-store, must-revalidate'
);

2
tests/lib/AppFramework/Controller/ControllerTest.php
View File

@ -182,7 +182,7 @@ class ControllerTest extends \Test\TestCase {
public function testFormatDataResponseJSON() {
$expectedHeaders = [
'test' => 'something',
'Cache-Control' => 'no-cache, must-revalidate',
'Cache-Control' => 'no-cache, no-store, must-revalidate',
'Content-Type' => 'application/json; charset=utf-8',
'Content-Security-Policy' => "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'",
];

2
tests/lib/AppFramework/Http/DataResponseTest.php
View File

@ -67,7 +67,7 @@ class DataResponseTest extends \Test\TestCase {
$response = new DataResponse($data, $code, $headers);
$expectedHeaders = [
'Cache-Control' => 'no-cache, must-revalidate',
'Cache-Control' => 'no-cache, no-store, must-revalidate',
'Content-Security-Policy' => "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'",
];
$expectedHeaders = array_merge($expectedHeaders, $headers);

2
tests/lib/AppFramework/Http/ResponseTest.php
View File

@ -97,7 +97,7 @@ class ResponseTest extends \Test\TestCase {
public function testCacheHeadersAreDisabledByDefault(){
$headers = $this->childResponse->getHeaders();
$this->assertEquals('no-cache, must-revalidate', $headers['Cache-Control']);
$this->assertEquals('no-cache, no-store, must-revalidate', $headers['Cache-Control']);
}