upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-20 08:29:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Properly return 304

Browse source 
The ETag set in the IF_NONE_MODIFIED header is wraped in quotes (").
However the ETag that is set in response is not (yet). Also we need to
cast the ETag to a string.

* Added unit test
This commit is contained in:
Roeland Jago Douma 2015-09-01 10:40:44 +02:00
parent e367f1bfc1
commit f12caf930e
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/private/appframework/http.php
View file

@ -121,7 +121,7 @@ class Http extends BaseHttp {
// if etag or lastmodified have not changed, return a not modified
if ((isset($this->server['HTTP_IF_NONE_MATCH'])
&& trim($this->server['HTTP_IF_NONE_MATCH']) === $ETag)
&& trim(trim($this->server['HTTP_IF_NONE_MATCH']), '"') === (string)$ETag)
||

8
tests/lib/appframework/http/HttpTest.php
View file

@ -65,6 +65,14 @@ class HttpTest extends \Test\TestCase {
}
public function testQuotedEtagMatchReturnsNotModified() {
$http = new Http(array('HTTP_IF_NONE_MATCH' => '"hi"'));
$header = $http->getStatusHeader(Http::STATUS_OK, null, 'hi');
$this->assertEquals('HTTP/1.1 304 Not Modified', $header);
}
public function testLastModifiedMatchReturnsNotModified() {
$dateTime = new \DateTime(null, new \DateTimeZone('GMT'));
$dateTime->setTimestamp('12');