From 6a60a47d595d29d9034f0bc1d565542cc76389d9 Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Thu, 17 Oct 2013 16:27:43 +0200 Subject: add options to disable the check for a working .htaccess file in data and for a working WebDAV server. This are advanced settings that are needed in special situations where our check fail and the user runs into an http timeout. --- lib/private/util.php | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lib/private/util.php') diff --git a/lib/private/util.php b/lib/private/util.php index 6c0a8d7bab5..dbe0dc4f6ad 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -754,6 +754,10 @@ class OC_Util { * file in the data directory and trying to access via http */ public static function isHtAccessWorking() { + if (!\OC_Config::getValue("check_for_working_htaccess", true)) { + return true; + } + // testdata $fileName = '/htaccesstest.txt'; $testContent = 'testcontent'; @@ -802,6 +806,9 @@ class OC_Util { if (!function_exists('curl_init')) { return true; } + if (!\OC_Config::getValue("check_for_working_webdav", true)) { + return true; + } $settings = array( 'baseUri' => OC_Helper::linkToRemote('webdav'), ); -- cgit v1.2.3