diff options
| author | Marius <marius@lineone.io> | 2016-06-08 13:25:56 +0200 |
|---|---|---|
| committer | Marius <marius@lineone.io> | 2016-06-08 13:25:56 +0200 |
| commit | 73a9afed6de7c329cc9226a9b869f3305d5910d6 (patch) | |
| tree | a84e2da773a7051a395ae3ba197ec84f1543e92f /lib | |
| parent | fb4981953d5d64c6afa45799ef64254ddb172883 (diff) | |
| parent | a49f5b72c6ad8f5a524e418ea34352655000928d (diff) | |
| download | nextcloud-server-73a9afed6de7c329cc9226a9b869f3305d5910d6.tar.gz nextcloud-server-73a9afed6de7c329cc9226a9b869f3305d5910d6.zip | |
Merge pull request #22 from nextcloud/fix-3rdparty-notice-stable9
[stable9] Print error message again, when 3rdparty submodule is not initialized
Diffstat (limited to 'lib')
| -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 e77a07239c4..b24acf09f60 100644 --- a/lib/base.php +++ b/lib/base.php @@ -513,7 +513,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 |