From af6c788efc81d7bf4d3aec6c267e545dcf4afad6 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Thu, 14 Nov 2019 17:20:14 +0100 Subject: pass through ServerNotAvailableException on app init Signed-off-by: Arthur Schiwon --- lib/private/legacy/app.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib/private') diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php index 9e47f9064d9..146262c3f95 100644 --- a/lib/private/legacy/app.php +++ b/lib/private/legacy/app.php @@ -55,6 +55,7 @@ use OC\App\Platform; use OC\DB\MigrationService; use OC\Installer; use OC\Repair; +use OC\ServerNotAvailableException; use OCP\App\ManagerEvent; use OCP\ILogger; @@ -153,6 +154,9 @@ class OC_App { try { self::requireAppFile($app); } catch (Throwable $ex) { + if($ex instanceof ServerNotAvailableException) { + throw $ex; + } \OC::$server->getLogger()->logException($ex); if (!\OC::$server->getAppManager()->isShipped($app)) { // Only disable apps which are not shipped -- cgit v1.2.3 From 417fd12d3aa8ac5fec8f07d518f743b83eea6620 Mon Sep 17 00:00:00 2001 From: Christian Oliff Date: Fri, 15 Nov 2019 16:19:28 +0900 Subject: HTTPS link to https://en.wikipedia.org/wiki/Server-sent_events prevents a redirect --- lib/private/legacy/eventsource.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/private') diff --git a/lib/private/legacy/eventsource.php b/lib/private/legacy/eventsource.php index 1e68dd24af0..aa3d3395443 100644 --- a/lib/private/legacy/eventsource.php +++ b/lib/private/legacy/eventsource.php @@ -27,7 +27,7 @@ */ /** - * wrapper for server side events (http://en.wikipedia.org/wiki/Server-sent_events) + * wrapper for server side events (https://en.wikipedia.org/wiki/Server-sent_events) * includes a fallback for older browsers and IE * * use server side events with caution, to many open requests can hang the server -- cgit v1.2.3