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

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

[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
parent 822d3f0e8b b9cb5a74cc
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']); unset($headers['Content-Type']);
} }
$response->setHeaders(array_merge($dataHeaders, $headers)); $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 $response;
} }
return new JSONResponse($data); return new JSONResponse($data);