Merge pull request #22 from nextcloud/fix-3rdparty-notice-stable9

[stable9] Print error message again, when 3rdparty submodule is not initialized
nextcloud · Jun 8, 2016 · 73a9afe · 73a9afe
2 parents fb49819 + a49f5b7
commit 73a9afe
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/base.php b/lib/base.php
@@ -513,7 +513,9 @@ public static function init() {
 
 		} 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