summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-08-25 22:02:27 +0200
committerMorris Jobke <hey@morrisjobke.de>2015-08-25 22:02:27 +0200
commite9241fcd8cdf3b1657ec9127bc5f8565b8b10677 (patch)
tree55cf9813a549a5c80ab471097b758824da3054ea
parent1ca638cfbd89c3eef70e591dd57d7d9469aebe62 (diff)
parentf3561e2349e0a3bac44cda9716f5cd373799a9b9 (diff)
downloadnextcloud-server-e9241fcd8cdf3b1657ec9127bc5f8565b8b10677.tar.gz
nextcloud-server-e9241fcd8cdf3b1657ec9127bc5f8565b8b10677.zip
Merge pull request #18562 from owncloud/explicit-use-statuscode-200
Explicitly specify status code 200 as response code
-rw-r--r--lib/private/connector/sabre/dummygetresponseplugin.php1
-rw-r--r--tests/lib/connector/sabre/DummyGetResponsePluginTest.php4
2 files changed, 5 insertions, 0 deletions
diff --git a/lib/private/connector/sabre/dummygetresponseplugin.php b/lib/private/connector/sabre/dummygetresponseplugin.php
index 6057236b635..6f5a009d084 100644
--- a/lib/private/connector/sabre/dummygetresponseplugin.php
+++ b/lib/private/connector/sabre/dummygetresponseplugin.php
@@ -61,6 +61,7 @@ class DummyGetResponsePlugin extends \Sabre\DAV\ServerPlugin {
fwrite($stream, $string);
rewind($stream);
+ $response->setStatus(200);
$response->setBody($stream);
return false;
diff --git a/tests/lib/connector/sabre/DummyGetResponsePluginTest.php b/tests/lib/connector/sabre/DummyGetResponsePluginTest.php
index fa8f0694625..096c2c5f0d2 100644
--- a/tests/lib/connector/sabre/DummyGetResponsePluginTest.php
+++ b/tests/lib/connector/sabre/DummyGetResponsePluginTest.php
@@ -59,6 +59,10 @@ class DummyGetResponsePluginTest extends TestCase {
$response
->expects($this->once())
->method('setBody');
+ $response
+ ->expects($this->once())
+ ->method('setStatus')
+ ->with(200);
$this->assertSame(false, $this->dummyGetResponsePlugin->httpGet($request, $response));
}