upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #39852 from nextcloud/pragmaHeader

Browse source 
Stop sending deprecated Pragma header
This commit is contained in:
Ferdinand Thiessen 2023-10-18 03:30:21 +02:00 committed by GitHub
commit 154a9989a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/dav/lib/CardDAV/ImageExportPlugin.php
View file

@ -98,7 +98,6 @@ class ImageExportPlugin extends ServerPlugin {
$response->setHeader('Cache-Control', 'private, max-age=3600, must-revalidate');
$response->setHeader('Etag', $node->getETag());
$response->setHeader('Pragma', 'public');
try {
$file = $this->cache->get($addressbook->getResourceId(), $node->getName(), $size, $node);

6
apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php
View file

@ -162,12 +162,11 @@ class ImageExportPluginTest extends TestCase {
->with(1, 'card', $size, $card)
->willReturn($file);
$this->response->expects($this->exactly(5))
$this->response->expects($this->exactly(4))
->method('setHeader')
->withConsecutive(
['Cache-Control', 'private, max-age=3600, must-revalidate'],
['Etag', '"myEtag"'],
['Pragma', 'public'],
['Content-Type', 'image/jpeg'],
['Content-Disposition', 'attachment; filename=card.jpg'],
);
@ -179,12 +178,11 @@ class ImageExportPluginTest extends TestCase {
->method('setBody')
->with('imgdata');
} else {
$this->response->expects($this->exactly(3))
$this->response->expects($this->exactly(2))
->method('setHeader')
->withConsecutive(
['Cache-Control', 'private, max-age=3600, must-revalidate'],
['Etag', '"myEtag"'],
['Pragma', 'public'],
);
$this->cache->method('get')
->with(1, 'card', $size, $card)

1
core/Controller/CssController.php
View file

@ -90,7 +90,6 @@ class CssController extends Controller {
$expires->setTimestamp($this->timeFactory->getTime());
$expires->add(new \DateInterval('PT'.$ttl.'S'));
$response->addHeader('Expires', $expires->format(\DateTime::RFC1123));
$response->addHeader('Pragma', 'cache');
return $response;
}

1
core/Controller/JsController.php
View file

@ -90,7 +90,6 @@ class JsController extends Controller {
$expires->setTimestamp($this->timeFactory->getTime());
$expires->add(new \DateInterval('PT'.$ttl.'S'));
$response->addHeader('Expires', $expires->format(\DateTime::RFC1123));
$response->addHeader('Pragma', 'cache');
return $response;
}

1
lib/private/legacy/OC_Files.php
View file

@ -76,7 +76,6 @@ class OC_Files {
private static function sendHeaders($filename, $name, array $rangeArray): void {
OC_Response::setContentDispositionHeader($name, 'attachment');
header('Content-Transfer-Encoding: binary', true);
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);

7
lib/public/AppFramework/Http/Response.php
View file

@ -112,9 +112,8 @@ class Response {
*/
public function cacheFor(int $cacheSeconds, bool $public = false, bool $immutable = false) {
if ($cacheSeconds > 0) {
$pragma = $public ? 'public' : 'private';
$this->addHeader('Cache-Control', sprintf('%s, max-age=%s, %s', $pragma, $cacheSeconds, ($immutable ? 'immutable' : 'must-revalidate')));
$this->addHeader('Pragma', $pragma);
$cacheStore = $public ? 'public' : 'private';
$this->addHeader('Cache-Control', sprintf('%s, max-age=%s, %s', $cacheStore, $cacheSeconds, ($immutable ? 'immutable' : 'must-revalidate')));
// Set expires header
$expires = new \DateTime();
@ -125,7 +124,7 @@ class Response {
$this->addHeader('Expires', $expires->format(\DateTimeInterface::RFC2822));
} else {
$this->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate');
unset($this->headers['Expires'], $this->headers['Pragma']);
unset($this->headers['Expires']);
}
return $this;

3
tests/Core/Controller/CssControllerTest.php
View file

@ -117,7 +117,6 @@ class CssControllerTest extends TestCase {
$expires->setTimestamp(1337);
$expires->add(new \DateInterval('PT31536000S'));
$expected->addHeader('Expires', $expires->format(\DateTime::RFC1123));
$expected->addHeader('Pragma', 'cache');
$result = $this->controller->getCss('file.css', 'myapp');
$this->assertEquals($expected, $result);
@ -147,7 +146,6 @@ class CssControllerTest extends TestCase {
$expires->setTimestamp(1337);
$expires->add(new \DateInterval('PT31536000S'));
$expected->addHeader('Expires', $expires->format(\DateTime::RFC1123));
$expected->addHeader('Pragma', 'cache');
$result = $this->controller->getCss('file.css', 'myapp');
$this->assertEquals($expected, $result);
@ -182,7 +180,6 @@ class CssControllerTest extends TestCase {
$expires->setTimestamp(1337);
$expires->add(new \DateInterval('PT31536000S'));
$expected->addHeader('Expires', $expires->format(\DateTime::RFC1123));
$expected->addHeader('Pragma', 'cache');
$result = $this->controller->getCss('file.css', 'myapp');
$this->assertEquals($expected, $result);

3
tests/Core/Controller/JsControllerTest.php
View file

@ -117,7 +117,6 @@ class JsControllerTest extends TestCase {
$expires->setTimestamp(1337);
$expires->add(new \DateInterval('PT31536000S'));
$expected->addHeader('Expires', $expires->format(\DateTime::RFC1123));
$expected->addHeader('Pragma', 'cache');
$result = $this->controller->getJs('file.js', 'myapp');
$this->assertEquals($expected, $result);
@ -147,7 +146,6 @@ class JsControllerTest extends TestCase {
$expires->setTimestamp(1337);
$expires->add(new \DateInterval('PT31536000S'));
$expected->addHeader('Expires', $expires->format(\DateTime::RFC1123));
$expected->addHeader('Pragma', 'cache');
$result = $this->controller->getJs('file.js', 'myapp');
$this->assertEquals($expected, $result);
@ -182,7 +180,6 @@ class JsControllerTest extends TestCase {
$expires->setTimestamp(1337);
$expires->add(new \DateInterval('PT31536000S'));
$expected->addHeader('Expires', $expires->format(\DateTime::RFC1123));
$expected->addHeader('Pragma', 'cache');
$result = $this->controller->getJs('file.js', 'myapp');
$this->assertEquals($expected, $result);

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

@ -229,7 +229,6 @@ class ResponseTest extends \Test\TestCase {
$headers = $this->childResponse->getHeaders();
$this->assertEquals('no-cache, no-store, must-revalidate', $headers['Cache-Control']);
$this->assertFalse(isset($headers['Pragma']));
$this->assertFalse(isset($headers['Expires']));
}
@ -245,7 +244,6 @@ class ResponseTest extends \Test\TestCase {
$headers = $this->childResponse->getHeaders();
$this->assertEquals('private, max-age=33, must-revalidate', $headers['Cache-Control']);
$this->assertEquals('private', $headers['Pragma']);
$this->assertEquals('Thu, 15 Jan 1970 06:56:40 +0000', $headers['Expires']);
}