aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/AppFramework/Middleware
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2016-07-22 15:15:20 +0200
committerGitHub <noreply@github.com>2016-07-22 15:15:20 +0200
commit9dafc516a7b18345d869e7b08eae88ae0510fb39 (patch)
tree3f9c5669113f81cd2a8a04438df8242f01759443 /lib/private/AppFramework/Middleware
parentaf3950146504fe0a14ef38c24c549ffeda74acf6 (diff)
parent72b06d250de023d9b0f9bcb9ec93896e3b4c55d9 (diff)
downloadnextcloud-server-9dafc516a7b18345d869e7b08eae88ae0510fb39.tar.gz
nextcloud-server-9dafc516a7b18345d869e7b08eae88ae0510fb39.zip
Merge pull request #524 from nextcloud/ocs_appframework_status_code
Set proper status code in OCS AppFramework Middleware
Diffstat (limited to 'lib/private/AppFramework/Middleware')
-rw-r--r--lib/private/AppFramework/Middleware/OCSMiddleware.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/private/AppFramework/Middleware/OCSMiddleware.php b/lib/private/AppFramework/Middleware/OCSMiddleware.php
index 90355a39ef0..0d97aa6ed94 100644
--- a/lib/private/AppFramework/Middleware/OCSMiddleware.php
+++ b/lib/private/AppFramework/Middleware/OCSMiddleware.php
@@ -56,7 +56,12 @@ class OCSMiddleware extends Middleware {
if ($code === 0) {
$code = Http::STATUS_INTERNAL_SERVER_ERROR;
}
- return new OCSResponse($format, $code, $exception->getMessage());
+ $response = new OCSResponse($format, $code, $exception->getMessage());
+
+ if ($this->request->getScriptName() === '/ocs/v2.php') {
+ $response->setStatus($code);
+ }
+ return $response;
}
throw $exception;