summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/files/ajax/list.php2
-rw-r--r--apps/files_sharing/public.php7
-rw-r--r--apps/files_trashbin/ajax/list.php2
-rw-r--r--apps/files_versions/download.php2
-rw-r--r--index.php26
-rw-r--r--lib/base.php25
-rw-r--r--lib/private/legacy/api.php4
-rw-r--r--lib/private/legacy/files.php8
-rw-r--r--lib/private/legacy/response.php43
-rw-r--r--ocs/v1.php6
-rw-r--r--public.php13
-rw-r--r--remote.php14
-rw-r--r--status.php2
13 files changed, 45 insertions, 109 deletions
diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php
index c013733dbb3..588c76154a5 100644
--- a/apps/files/ajax/list.php
+++ b/apps/files/ajax/list.php
@@ -38,7 +38,7 @@ $dir = \OC\Files\Filesystem::normalizePath($dir);
try {
$dirInfo = \OC\Files\Filesystem::getFileInfo($dir);
if (!$dirInfo || !$dirInfo->getType() === 'dir') {
- header("HTTP/1.0 404 Not Found");
+ http_response_code(404);
exit();
}
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 0ca7e8f245e..e1e4aa877b2 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -30,14 +30,13 @@ $route = isset($_GET['download']) ? 'files_sharing.sharecontroller.downloadShare
if($token !== '') {
$protocol = \OC::$server->getRequest()->getHttpProtocol();
if ($protocol == 'HTTP/1.0') {
- $status = '302 Found';
+ http_response_code(302);
} else {
- $status = '307 Temporary Redirect';
+ http_response_code(307);
}
- header($protocol.' ' . $status);
header('Location: ' . $urlGenerator->linkToRoute($route, array('token' => $token)));
} else {
- header('HTTP/1.0 404 Not Found');
+ http_response_code(404);
$tmpl = new OCP\Template('', '404', 'guest');
print_unescaped($tmpl->fetchPage());
}
diff --git a/apps/files_trashbin/ajax/list.php b/apps/files_trashbin/ajax/list.php
index c31a33c2050..e72c063f428 100644
--- a/apps/files_trashbin/ajax/list.php
+++ b/apps/files_trashbin/ajax/list.php
@@ -34,7 +34,7 @@ $data = array();
try {
$files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser(), $sortAttribute, $sortDirection);
} catch (Exception $e) {
- header("HTTP/1.0 404 Not Found");
+ http_response_code(404);
exit();
}
diff --git a/apps/files_versions/download.php b/apps/files_versions/download.php
index 77f3e9f0887..65ba245d71d 100644
--- a/apps/files_versions/download.php
+++ b/apps/files_versions/download.php
@@ -34,7 +34,7 @@ $revision=(int)$_GET['revision'];
try {
list($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($file);
} catch(\OCP\Files\NotFoundException $e) {
- header("HTTP/1.1 404 Not Found");
+ http_response_code(404);
$tmpl = new OCP\Template('', '404', 'guest');
$tmpl->assign('file', '');
$tmpl->printPage();
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);
}
diff --git a/lib/base.php b/lib/base.php
index 60a4c03bc41..8ca4a371afb 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -287,8 +287,7 @@ class OC {
// Allow ajax update script to execute without being stopped
if (\OC::$server->getSystemConfig()->getValue('maintenance', false) && OC::$SUBURI != '/core/ajax/update.php') {
// send http status 503
- header('HTTP/1.1 503 Service Temporarily Unavailable');
- header('Status: 503 Service Temporarily Unavailable');
+ http_response_code(503);
header('Retry-After: 120');
// render error page
@@ -344,8 +343,7 @@ class OC {
if ($disableWebUpdater || ($tooBig && !$ignoreTooBigWarning)) {
// send http status 503
- header('HTTP/1.1 503 Service Temporarily Unavailable');
- header('Status: 503 Service Temporarily Unavailable');
+ http_response_code(503);
header('Retry-After: 120');
// render error page
@@ -434,7 +432,7 @@ class OC {
} catch (Exception $e) {
\OC::$server->getLogger()->logException($e, ['app' => 'base']);
//show the user a detailed error page
- OC_Template::printExceptionErrorPage($e, \OC_Response::STATUS_INTERNAL_SERVER_ERROR);
+ OC_Template::printExceptionErrorPage($e, 500);
die();
}
@@ -600,9 +598,7 @@ class OC {
} catch (\RuntimeException $e) {
if (!self::$CLI) {
- $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);
+ http_response_code(503);
}
// we can't use the template error page here, because this needs the
// DI container which isn't available yet
@@ -689,7 +685,7 @@ class OC {
}
exit(1);
} else {
- OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
+ http_response_code(503);
OC_Util::addStyle('guest');
OC_Template::printGuestPage('', 'error', array('errors' => $errors));
exit;
@@ -778,16 +774,14 @@ class OC {
}
if(substr($request->getRequestUri(), -11) === '/status.php') {
- OC_Response::setStatus(\OC_Response::STATUS_BAD_REQUEST);
- header('Status: 400 Bad Request');
+ http_response_code(400);
header('Content-Type: application/json');
echo '{"error": "Trusted domain error.", "code": 15}';
exit();
}
if (!$isScssRequest) {
- OC_Response::setStatus(\OC_Response::STATUS_BAD_REQUEST);
- header('Status: 400 Bad Request');
+ http_response_code(400);
\OC::$server->getLogger()->info(
'Trusted domain error. "{remoteAddress}" tried to access using "{host}" as host.',
@@ -997,7 +991,7 @@ class OC {
} catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {
//header('HTTP/1.0 404 Not Found');
} catch (Symfony\Component\Routing\Exception\MethodNotAllowedException $e) {
- OC_Response::setStatus(405);
+ http_response_code(405);
return;
}
}
@@ -1007,8 +1001,7 @@ class OC {
// not allowed any more to prevent people
// mounting this root directly.
// Users need to mount remote.php/webdav instead.
- header('HTTP/1.1 405 Method Not Allowed');
- header('Status: 405 Method Not Allowed');
+ http_response_code(405);
return;
}
diff --git a/lib/private/legacy/api.php b/lib/private/legacy/api.php
index fde1d99e79d..40bf6132e28 100644
--- a/lib/private/legacy/api.php
+++ b/lib/private/legacy/api.php
@@ -88,7 +88,7 @@ class OC_API {
} else {
header('WWW-Authenticate: Basic realm="Authorisation Required"');
}
- header('HTTP/1.0 401 Unauthorized');
+ http_response_code(401);
}
foreach($result->getHeaders() as $name => $value) {
@@ -101,7 +101,7 @@ class OC_API {
$statusCode = self::mapStatusCodes($result->getStatusCode());
if (!is_null($statusCode)) {
$meta['statuscode'] = $statusCode;
- OC_Response::setStatus($statusCode);
+ http_response_code($statusCode);
}
}
diff --git a/lib/private/legacy/files.php b/lib/private/legacy/files.php
index f4474197d86..159e18c7754 100644
--- a/lib/private/legacy/files.php
+++ b/lib/private/legacy/files.php
@@ -83,7 +83,7 @@ class OC_Files {
$type = \OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType($filename));
if ($fileSize > -1) {
if (!empty($rangeArray)) {
- header('HTTP/1.1 206 Partial Content', true);
+ http_response_code(206);
header('Accept-Ranges: bytes', true);
if (count($rangeArray) > 1) {
$type = 'multipart/byteranges; boundary='.self::getBoundary();
@@ -286,12 +286,12 @@ class OC_Files {
if (\OC\Files\Filesystem::isReadable($filename)) {
self::sendHeaders($filename, $name, $rangeArray);
} elseif (!\OC\Files\Filesystem::file_exists($filename)) {
- header("HTTP/1.1 404 Not Found");
+ http_response_code(404);
$tmpl = new OC_Template('', '404', 'guest');
$tmpl->printPage();
exit();
} else {
- header("HTTP/1.1 403 Forbidden");
+ http_response_code(403);
die('403 Forbidden');
}
if (isset($params['head']) && $params['head']) {
@@ -321,7 +321,7 @@ class OC_Files {
// file is unseekable
header_remove('Accept-Ranges');
header_remove('Content-Range');
- header("HTTP/1.1 200 OK");
+ http_response_code(200);
self::sendHeaders($filename, $name, array());
$view->readfile($filename);
}
diff --git a/lib/private/legacy/response.php b/lib/private/legacy/response.php
index 4186822c269..93023f61e99 100644
--- a/lib/private/legacy/response.php
+++ b/lib/private/legacy/response.php
@@ -31,49 +31,6 @@
*/
class OC_Response {
- const STATUS_FOUND = 302;
- const STATUS_NOT_MODIFIED = 304;
- const STATUS_TEMPORARY_REDIRECT = 307;
- const STATUS_BAD_REQUEST = 400;
- const STATUS_FORBIDDEN = 403;
- const STATUS_NOT_FOUND = 404;
- const STATUS_INTERNAL_SERVER_ERROR = 500;
- const STATUS_SERVICE_UNAVAILABLE = 503;
-
- /**
- * Set response status
- * @param int $status a HTTP status code, see also the STATUS constants
- */
- static public function setStatus($status) {
- $protocol = \OC::$server->getRequest()->getHttpProtocol();
- switch($status) {
- case self::STATUS_NOT_MODIFIED:
- $status = $status . ' Not Modified';
- break;
- case self::STATUS_TEMPORARY_REDIRECT:
- if ($protocol == 'HTTP/1.0') {
- $status = self::STATUS_FOUND;
- // fallthrough
- } else {
- $status = $status . ' Temporary Redirect';
- break;
- }
- case self::STATUS_FOUND;
- $status = $status . ' Found';
- break;
- case self::STATUS_NOT_FOUND;
- $status = $status . ' Not Found';
- break;
- case self::STATUS_INTERNAL_SERVER_ERROR;
- $status = $status . ' Internal Server Error';
- break;
- case self::STATUS_SERVICE_UNAVAILABLE;
- $status = $status . ' Service Unavailable';
- break;
- }
- header($protocol.' '.$status);
- }
-
/**
* Sets the content disposition header (with possible workarounds)
* @param string $filename file name
diff --git a/ocs/v1.php b/ocs/v1.php
index fb996d0564d..1f5d3e6619e 100644
--- a/ocs/v1.php
+++ b/ocs/v1.php
@@ -36,7 +36,7 @@ if (\OCP\Util::needUpgrade()
|| \OC::$server->getSystemConfig()->getValue('maintenance', false)) {
// since the behavior of apps or remotes are unpredictable during
// an upgrade, return a 503 directly
- OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
+ http_response_code(503);
$response = new \OC\OCS\Result(null, OC_Response::STATUS_SERVICE_UNAVAILABLE, 'Service unavailable');
OC_API::respond($response, OC_API::requestedFormat());
exit;
@@ -65,7 +65,7 @@ try {
// Fall through the not found
} catch (MethodNotAllowedException $e) {
OC_API::setContentType();
- OC_Response::setStatus(405);
+ http_response_code(405);
exit();
} catch (Exception $ex) {
OC_API::respond($ex->getResult(), OC_API::requestedFormat());
@@ -89,7 +89,7 @@ try {
OC_API::respond(new \OC\OCS\Result(null, \OCP\API::RESPOND_NOT_FOUND, $txt), $format);
} catch (MethodNotAllowedException $e) {
OC_API::setContentType();
- OC_Response::setStatus(405);
+ http_response_code(405);
} catch (\OC\OCS\Exception $ex) {
OC_API::respond($ex->getResult(), OC_API::requestedFormat());
} catch (\OC\User\LoginException $e) {
diff --git a/public.php b/public.php
index c81a6b5a960..d50f49e2536 100644
--- a/public.php
+++ b/public.php
@@ -36,7 +36,7 @@ try {
if (\OCP\Util::needUpgrade()) {
// since the behavior of apps or remotes are unpredictable during
// an upgrade, return a 503 directly
- OC_Template::printErrorPage('Service unavailable', '', OC_Response::STATUS_SERVICE_UNAVAILABLE);
+ OC_Template::printErrorPage('Service unavailable', '', 503);
exit;
}
@@ -45,7 +45,7 @@ try {
$pathInfo = $request->getPathInfo();
if (!$pathInfo && $request->getParam('service', '') === '') {
- header('HTTP/1.0 404 Not Found');
+ http_response_code(404);
exit;
} elseif ($request->getParam('service', '')) {
$service = $request->getParam('service', '');
@@ -55,7 +55,7 @@ try {
}
$file = \OC::$server->getConfig()->getAppValue('core', 'public_' . strip_tags($service));
if ($file === null) {
- header('HTTP/1.0 404 Not Found');
+ http_response_code(404);
exit;
}
@@ -78,10 +78,9 @@ try {
require_once OC_App::getAppPath($app) . '/' . $parts[1];
} catch (Exception $ex) {
+ $status = 500;
if ($ex instanceof \OC\ServiceUnavailableException) {
- $status = OC_Response::STATUS_SERVICE_UNAVAILABLE;
- } else {
- $status = OC_Response::STATUS_INTERNAL_SERVER_ERROR;
+ $status = 503;
}
//show the user a detailed error page
\OC::$server->getLogger()->logException($ex, ['app' => 'public']);
@@ -89,5 +88,5 @@ try {
} catch (Error $ex) {
//show the user a detailed error page
\OC::$server->getLogger()->logException($ex, ['app' => 'public']);
- OC_Template::printExceptionErrorPage($ex, OC_Response::STATUS_INTERNAL_SERVER_ERROR);
+ OC_Template::printExceptionErrorPage($ex, 500);
}
diff --git a/remote.php b/remote.php
index d90bb2d8ee5..11940b025dd 100644
--- a/remote.php
+++ b/remote.php
@@ -59,9 +59,9 @@ function handleException($e) {
$server->on('beforeMethod', function () use ($e) {
if ($e instanceof RemoteException) {
switch ($e->getCode()) {
- case OC_Response::STATUS_SERVICE_UNAVAILABLE:
+ case 503:
throw new ServiceUnavailable($e->getMessage());
- case OC_Response::STATUS_NOT_FOUND:
+ case 404:
throw new \Sabre\DAV\Exception\NotFound($e->getMessage());
}
}
@@ -71,9 +71,9 @@ function handleException($e) {
});
$server->exec();
} else {
- $statusCode = OC_Response::STATUS_INTERNAL_SERVER_ERROR;
+ $statusCode = 500;
if ($e instanceof \OC\ServiceUnavailableException ) {
- $statusCode = OC_Response::STATUS_SERVICE_UNAVAILABLE;
+ $statusCode = 503;
}
if ($e instanceof RemoteException) {
// we shall not log on RemoteException
@@ -118,13 +118,13 @@ try {
if (\OCP\Util::needUpgrade()) {
// since the behavior of apps or remotes are unpredictable during
// an upgrade, return a 503 directly
- throw new RemoteException('Service unavailable', OC_Response::STATUS_SERVICE_UNAVAILABLE);
+ throw new RemoteException('Service unavailable', 503);
}
$request = \OC::$server->getRequest();
$pathInfo = $request->getPathInfo();
if ($pathInfo === false || $pathInfo === '') {
- throw new RemoteException('Path not found', OC_Response::STATUS_NOT_FOUND);
+ throw new RemoteException('Path not found', 404);
}
if (!$pos = strpos($pathInfo, '/', 1)) {
$pos = strlen($pathInfo);
@@ -134,7 +134,7 @@ try {
$file = resolveService($service);
if(is_null($file)) {
- throw new RemoteException('Path not found', OC_Response::STATUS_NOT_FOUND);
+ throw new RemoteException('Path not found', 404);
}
$file=ltrim($file, '/');
diff --git a/status.php b/status.php
index cc5d5215770..274a2edc610 100644
--- a/status.php
+++ b/status.php
@@ -59,6 +59,6 @@ try {
}
} catch (Exception $ex) {
- OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
+ http_response_code(500);
\OC::$server->getLogger()->logException($ex, ['app' => 'remote']);
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-16 06:37:40 +0000