upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 17:23:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57

Merge pull request #21047 from nextcloud/backport/21041/stable19

Browse source 
[stable19] Copy over the ETag and LastModified when formatting a Dataresponse
This commit is contained in:
Roeland Jago Douma 2020-05-19 20:40:47 +02:00 committed by GitHub
commit 5763ce2761
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/public/AppFramework/Controller.php
View file

@ -91,6 +91,14 @@ abstract class Controller {
unset($headers['Content-Type']);
}
$response->setHeaders(array_merge($dataHeaders, $headers));
if ($data->getETag() !== null) {
$response->setETag($data->getETag());
}
if ($data->getLastModified() !== null) {
$response->setLastModified($data->getLastModified());
}
return $response;
}
return new JSONResponse($data);