diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2014-05-07 17:54:38 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2014-05-07 17:54:38 +0200 |
| commit | f569c721a64486d0e7c7e307ed77ac0caed2dc2d (patch) | |
| tree | df7b3399a858ffdae6bd6e66616746efbcee24bc /lib/private/response.php | |
| parent | 47d70da2f5cb55ad47023b061b68062dd8b8d8e2 (diff) | |
| parent | 254fa5eb22efa5ba572702064377a6ad9eec9a53 (diff) | |
| download | nextcloud-server-f569c721a64486d0e7c7e307ed77ac0caed2dc2d.tar.gz nextcloud-server-f569c721a64486d0e7c7e307ed77ac0caed2dc2d.zip | |
Merge branch 'master' into optimize-startup-queries
Conflicts:
apps/files_sharing/lib/sharedstorage.php
tests/lib/group/manager.php
removed hasFilesSharedWith from lib/public/share.php and
sharedstorage.php to fix merge
Diffstat (limited to 'lib/private/response.php')
| -rw-r--r-- | lib/private/response.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/private/response.php b/lib/private/response.php index 71c538fb311..1aa5e629b8b 100644 --- a/lib/private/response.php +++ b/lib/private/response.php @@ -12,6 +12,7 @@ class OC_Response { const STATUS_TEMPORARY_REDIRECT = 307; const STATUS_NOT_FOUND = 404; const STATUS_INTERNAL_SERVER_ERROR = 500; + const STATUS_SERVICE_UNAVAILABLE = 503; /** * @brief Enable response caching by sending correct HTTP headers @@ -49,7 +50,7 @@ class OC_Response { /** * @brief Set response status - * @param $status a HTTP status code, see also the STATUS constants + * @param int $status a HTTP status code, see also the STATUS constants */ static public function setStatus($status) { $protocol = $_SERVER['SERVER_PROTOCOL']; @@ -74,6 +75,9 @@ class OC_Response { 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); } |