summaryrefslogtreecommitdiffstats
path: root/lib/private/util.php
diff options
context:
space:
mode:
authorFrank Karlitschek <frank@owncloud.org>2013-10-17 16:27:43 +0200
committerFrank Karlitschek <frank@owncloud.org>2013-10-17 16:27:43 +0200
commit6a60a47d595d29d9034f0bc1d565542cc76389d9 (patch)
tree2bf5cfc49bc27b1df847254966e954610324a7b2 /lib/private/util.php
parentc3c27b3e58f12da410304a7ee12f0c2668f0eec9 (diff)
downloadnextcloud-server-6a60a47d595d29d9034f0bc1d565542cc76389d9.tar.gz
nextcloud-server-6a60a47d595d29d9034f0bc1d565542cc76389d9.zip
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.
Diffstat (limited to 'lib/private/util.php')
-rwxr-xr-xlib/private/util.php7
1 files changed, 7 insertions, 0 deletions
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'),
);