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

Merge pull request #18730 from owncloud/appframework_proper_304 

Properly return 304 in AppFramework
This commit is contained in:
Vincent Petry 2015-09-01 15:39:59 +02:00
parent 01152676cd f12caf930e
commit 87b3e28f06
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');