diff options
author | blizzz <blizzz@arthur-schiwon.de> | 2016-06-08 10:59:12 +0200 |
---|---|---|
committer | blizzz <blizzz@arthur-schiwon.de> | 2016-06-08 10:59:12 +0200 |
commit | bc8fe825b2d3d887ce44c6b52d1273b5c331b3cb (patch) | |
tree | c389332ea6b5e097da3d87697b5b5c839cc7c749 | |
parent | 1aa7db56429cab3172288ea92e01226d10615ed0 (diff) | |
parent | 39aeebfac560e0a2eef6ab6c793cc9b5c0930d85 (diff) | |
download | nextcloud-server-bc8fe825b2d3d887ce44c6b52d1273b5c331b3cb.tar.gz nextcloud-server-bc8fe825b2d3d887ce44c6b52d1273b5c331b3cb.zip |
Merge pull request #20 from nextcloud/fix-3rdparty-notice
Print error message again, when 3rdparty submodule is not initialized
-rw-r--r-- | lib/base.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php index b33687dbab7..be14f49cab3 100644 --- a/lib/base.php +++ b/lib/base.php @@ -501,7 +501,9 @@ class OC { } catch (\RuntimeException $e) { if (!self::$CLI) { - OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE); + $claimedProtocol = strtoupper($_SERVER['SERVER_PROTOCOL']); + $protocol = in_array($claimedProtocol, ['HTTP/1.0', 'HTTP/1.1', 'HTTP/2']) ? $claimedProtocol : 'HTTP/1.1'; + header($protocol . ' ' . OC_Response::STATUS_SERVICE_UNAVAILABLE); } // we can't use the template error page here, because this needs the // DI container which isn't available yet |