summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2015-08-25 18:07:40 +0200
committerLukas Reschke <lukas@owncloud.com>2015-08-25 18:07:40 +0200
commitf3561e2349e0a3bac44cda9716f5cd373799a9b9 (patch)
treedde00409c3791a18f4d375d02ce38887687a97b0
parent840a2a7788a367b075ea4e07d7dc4adc4a4fa2ce (diff)
downloadnextcloud-server-f3561e2349e0a3bac44cda9716f5cd373799a9b9.tar.gz
nextcloud-server-f3561e2349e0a3bac44cda9716f5cd373799a9b9.zip
Explicitly specify status code 200 as response code
Potentially fixes https://github.com/owncloud/core/issues/17586
-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));
}