X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/6a7e0d652b1d40a397e1c1386d500101796676c4..3fb739de9275680d4f482d363f22c535442f0017:/lib-php/init-website.php diff --git a/lib-php/init-website.php b/lib-php/init-website.php index f2d52980..60367503 100644 --- a/lib-php/init-website.php +++ b/lib-php/init-website.php @@ -1,4 +1,12 @@ getCode()); + http_response_code($exception->getCode() == 0 ? 500 : $exception->getCode()); header('Content-type: application/json; charset=utf-8'); include(CONST_LibDir.'/template/error-json.php'); exit(); @@ -26,7 +34,7 @@ function exception_handler_json($exception) function exception_handler_xml($exception) { - http_response_code($exception->getCode()); + http_response_code($exception->getCode() == 0 ? 500 : $exception->getCode()); header('Content-type: text/xml; charset=utf-8'); echo ''."\n"; include(CONST_LibDir.'/template/error-xml.php'); @@ -37,7 +45,7 @@ function shutdown_exception_handler_xml() { $error = error_get_last(); if ($error !== null && $error['type'] === E_ERROR) { - exception_handler_xml(new Exception($error['message'], 500)); + exception_handler_xml(new \Exception($error['message'], 500)); } } @@ -45,7 +53,7 @@ function shutdown_exception_handler_json() { $error = error_get_last(); if ($error !== null && $error['type'] === E_ERROR) { - exception_handler_json(new Exception($error['message'], 500)); + exception_handler_json(new \Exception($error['message'], 500)); } } @@ -81,6 +89,10 @@ if (CONST_NoAccessControl) { header('Access-Control-Allow-Headers: '.$_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']); } } -if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'OPTIONS') exit; +if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'OPTIONS') { + exit; +} -if (CONST_Debug) header('Content-type: text/html; charset=utf-8'); +if (CONST_Debug) { + header('Content-type: text/html; charset=utf-8'); +}