aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2016-08-30 17:41:45 +0200
committerGitHub <noreply@github.com>2016-08-30 17:41:45 +0200
commit2a6193e7aadbf41d454f4002773191cc503696b4 (patch)
tree5dfb99de70555f70c6194d468bc917d11591fb66
parentc54d6d05c9186a4a814235006abf6e74242bc3a2 (diff)
parentacffaa55a1a2834a88bc316e297a7ceb9499e65d (diff)
downloadnextcloud-server-2a6193e7aadbf41d454f4002773191cc503696b4.tar.gz
nextcloud-server-2a6193e7aadbf41d454f4002773191cc503696b4.zip
Merge pull request #1195 from nextcloud/heartbeat-short-circuit
Short circuit processing of the heartbeat request
-rw-r--r--lib/base.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/base.php b/lib/base.php
index 68eab7c4acf..fe7419e6ff3 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -922,6 +922,9 @@ class OC {
$request = \OC::$server->getRequest();
$requestPath = $request->getRawPathInfo();
+ if ($requestPath === '/heartbeat') {
+ return;
+ }
if (substr($requestPath, -3) !== '.js') { // we need these files during the upgrade
self::checkMaintenanceMode();
self::checkUpgrade();