diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-06-27 12:14:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-27 12:14:52 +0200 |
| commit | e4e3387417deefbd873d469dfa9fa97444ca1a11 (patch) | |
| tree | 13c9c3132aa036e4f8cee4d42a07c92dc50e3e8f /index.php | |
| parent | d984be7e2a23d41d03865309e37e66cb00e7ca65 (diff) | |
| parent | b0a296e2e1dd1b173d9cab8c82158ac6bfb86f9e (diff) | |
| download | nextcloud-server-e4e3387417deefbd873d469dfa9fa97444ca1a11.tar.gz nextcloud-server-e4e3387417deefbd873d469dfa9fa97444ca1a11.zip | |
Merge pull request #10009 from nextcloud/techdebt/noid/replace-headers-with-http_response_code-calls
Replace hard coded HTTP status codes with proper calls to http_response_code
Diffstat (limited to 'index.php')
| -rw-r--r-- | index.php | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/index.php b/index.php index b66281e6449..4b5991a3ade 100644 --- a/index.php +++ b/index.php @@ -45,41 +45,29 @@ try { \OC::$server->getLogger()->logException($ex, array('app' => 'index')); //show the user a detailed error page - OC_Template::printExceptionErrorPage($ex, \OC_Response::STATUS_SERVICE_UNAVAILABLE); + OC_Template::printExceptionErrorPage($ex, 503); } catch (\OC\HintException $ex) { try { - OC_Template::printErrorPage($ex->getMessage(), $ex->getHint(), OC_Response::STATUS_SERVICE_UNAVAILABLE); + OC_Template::printErrorPage($ex->getMessage(), $ex->getHint(), 503); } catch (Exception $ex2) { \OC::$server->getLogger()->logException($ex, array('app' => 'index')); \OC::$server->getLogger()->logException($ex2, array('app' => 'index')); //show the user a detailed error page - OC_Template::printExceptionErrorPage($ex, \OC_Response::STATUS_INTERNAL_SERVER_ERROR); + OC_Template::printExceptionErrorPage($ex, 500); } } catch (\OC\User\LoginException $ex) { - OC_Template::printErrorPage($ex->getMessage(), $ex->getMessage(), OC_Response::STATUS_FORBIDDEN); + OC_Template::printErrorPage($ex->getMessage(), $ex->getMessage(), 403); } catch (Exception $ex) { \OC::$server->getLogger()->logException($ex, array('app' => 'index')); //show the user a detailed error page - OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR); - OC_Template::printExceptionErrorPage($ex); + OC_Template::printExceptionErrorPage($ex, 500); } catch (Error $ex) { try { \OC::$server->getLogger()->logException($ex, array('app' => 'index')); } catch (Error $e) { - - $claimedProtocol = strtoupper($_SERVER['SERVER_PROTOCOL']); - $validProtocols = [ - 'HTTP/1.0', - 'HTTP/1.1', - 'HTTP/2', - ]; - $protocol = 'HTTP/1.1'; - if(in_array($claimedProtocol, $validProtocols, true)) { - $protocol = $claimedProtocol; - } - header($protocol . ' 500 Internal Server Error'); + http_response_code(500); header('Content-Type: text/plain; charset=utf-8'); print("Internal Server Error\n\n"); print("The server encountered an internal error and was unable to complete your request.\n"); @@ -88,5 +76,5 @@ try { throw $e; } - OC_Template::printExceptionErrorPage($ex, \OC_Response::STATUS_INTERNAL_SERVER_ERROR); + OC_Template::printExceptionErrorPage($ex, 500); } |