diff options
| -rw-r--r-- | lib/private/api.php | 2 | ||||
| -rw-r--r-- | ocs/v1.php | 9 | ||||
| -rw-r--r-- | public.php | 8 |
3 files changed, 18 insertions, 1 deletions
diff --git a/lib/private/api.php b/lib/private/api.php index 74887690952..e9c144564f0 100644 --- a/lib/private/api.php +++ b/lib/private/api.php @@ -301,7 +301,7 @@ class OC_API { * @param OC_OCS_Result $result * @param string $format the format xml|json */ - private static function respond($result, $format='xml') { + public static function respond($result, $format='xml') { // Send 401 headers if unauthorised if($result->getStatusCode() === self::RESPOND_UNAUTHORISED) { header('WWW-Authenticate: Basic realm="Authorisation Required"'); diff --git a/ocs/v1.php b/ocs/v1.php index d69904fc495..0a86fb06411 100644 --- a/ocs/v1.php +++ b/ocs/v1.php @@ -23,6 +23,15 @@ require_once '../lib/base.php'; +if (\OCP\Util::needUpgrade()) { + // since the behavior of apps or remotes are unpredictable during + // an upgrade, return a 503 directly + OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE); + $response = new OC_OCS_Result(null, OC_Response::STATUS_SERVICE_UNAVAILABLE, 'Service unavailable'); + OC_API::respond($response, OC_API::requestedFormat()); + exit; +} + use Symfony\Component\Routing\Exception\ResourceNotFoundException; use Symfony\Component\Routing\Exception\MethodNotAllowedException; diff --git a/public.php b/public.php index eed63948112..1f858fd073d 100644 --- a/public.php +++ b/public.php @@ -3,6 +3,14 @@ try { require_once 'lib/base.php'; + if (\OCP\Util::needUpgrade()) { + // since the behavior of apps or remotes are unpredictable during + // an upgrade, return a 503 directly + OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE); + OC_Template::printErrorPage('Service unavailable'); + exit; + } + OC::checkMaintenanceMode(); OC::checkSingleUserMode(); $pathInfo = OC_Request::getPathInfo(); |