aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2016-12-19 08:38:02 +0100
committerGitHub <noreply@github.com>2016-12-19 08:38:02 +0100
commit4f79d2ff0d0f3b4e6bcbba0ab876e19d0a17588c (patch)
tree518dfe1cbb41dca6b397771cc3c84d6b66013cbb
parentf54547ff1c992f44f32d5147535ac77d808a2b79 (diff)
parent00f135d320fecee402c6b3a72cd9103b00750303 (diff)
downloadnextcloud-server-4f79d2ff0d0f3b4e6bcbba0ab876e19d0a17588c.tar.gz
nextcloud-server-4f79d2ff0d0f3b4e6bcbba0ab876e19d0a17588c.zip
Merge pull request #2721 from nextcloud/ocs-die-on-exception
[downstream] Die in OCS v1.php on exception
-rw-r--r--ocs/v1.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/ocs/v1.php b/ocs/v1.php
index 5aec27ad981..79e74f20cdf 100644
--- a/ocs/v1.php
+++ b/ocs/v1.php
@@ -65,8 +65,10 @@ try {
} catch (MethodNotAllowedException $e) {
OC_API::setContentType();
OC_Response::setStatus(405);
-} catch (\OC\OCS\Exception $ex) {
+ exit();
+} catch (Exception $ex) {
OC_API::respond($ex->getResult(), OC_API::requestedFormat());
+ exit();
}
/*