Merge pull request #3802 from Ko-/master

Check that set_time_limit is not disabled before calling it

2 files changed, 18 insertions, 1 deletions

diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php
index 016f6a1dab2..5e2aa365f67 100644
--- a/settings/Controller/CheckSetupController.php
+++ b/settings/Controller/CheckSetupController.php
@@ -286,6 +286,20 @@ class CheckSetupController extends Controller {
 	}
 
 	/**
+	 * Checks if set_time_limit is not disabled.
+	 *
+	 * @return bool
+	 */
+	private function isSettimelimitAvailable() {
+		if (function_exists('set_time_limit')
+			&& strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
 	 * @return RedirectResponse
 	 */
 	public function rescanFailedIntegrityCheck() {
@@ -411,6 +425,7 @@ Raw output
 				'codeIntegrityCheckerDocumentation' => $this->urlGenerator->linkToDocs('admin-code-integrity'),
 				'isOpcacheProperlySetup' => $this->isOpcacheProperlySetup(),
 				'phpOpcacheDocumentation' => $this->urlGenerator->linkToDocs('admin-php-opcache'),
+				'isSettimelimitAvailable' => $this->isSettimelimitAvailable(),
 			]
 		);
 	}
diff --git a/settings/Controller/EncryptionController.php b/settings/Controller/EncryptionController.php
index cda50853fdc..0c8dd529a7d 100644
--- a/settings/Controller/EncryptionController.php
+++ b/settings/Controller/EncryptionController.php
@@ -105,7 +105,9 @@ class EncryptionController extends Controller {
 	 */
 	public function startMigration() {
         // allow as long execution on the web server as possible
-		set_time_limit(0);
+		if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
+			@set_time_limit(0);
+		}
 
 		try {