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

Merge pull request #20722 from nextcloud/enh/20693/etag-capabilities 

Set etag for capabilities endpoint
This commit is contained in:
Morris Jobke 2020-05-04 10:22:01 +02:00 committed by GitHub
parent e102264299 df669a2936
commit a93d182bac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/Controller/OCSController.php
View File

@ -108,7 +108,9 @@ class OCSController extends \OCP\AppFramework\OCSController {
$result['capabilities'] = $this->capabilitiesManager->getCapabilities(true); $result['capabilities'] = $this->capabilitiesManager->getCapabilities(true);
} }
return new DataResponse($result); $response = new DataResponse($result);
$response->setETag(md5(json_encode($result)));
return $response;
} }
/** /**

2
tests/Core/Controller/OCSControllerTest.php
View File

@ -113,6 +113,7 @@ class OCSControllerTest extends TestCase {
$result['capabilities'] = $capabilities; $result['capabilities'] = $capabilities;
$expected = new DataResponse($result); $expected = new DataResponse($result);
$expected->setETag(md5(json_encode($result)));
$this->assertEquals($expected, $this->controller->getCapabilities()); $this->assertEquals($expected, $this->controller->getCapabilities());
} }
@ -146,6 +147,7 @@ class OCSControllerTest extends TestCase {
$result['capabilities'] = $capabilities; $result['capabilities'] = $capabilities;
$expected = new DataResponse($result); $expected = new DataResponse($result);
$expected->setETag(md5(json_encode($result)));
$this->assertEquals($expected, $this->controller->getCapabilities()); $this->assertEquals($expected, $this->controller->getCapabilities());
} }