From 6a60a47d595d29d9034f0bc1d565542cc76389d9 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Thu, 17 Oct 2013 16:27:43 +0200
Subject: [PATCH] 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.

---
 config/config.sample.php | 6 ++++++
 lib/private/util.php     | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/config/config.sample.php b/config/config.sample.php
index 9a24c9364e..54dbf3f7c3 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -129,6 +129,12 @@ $CONFIG = array(
 /* Are we connected to the internet or are we running in a closed network? */
 "has_internet_connection" => true,
 
+/* Check if the ownCloud WebDAV server is working correctly. Can be disabled if not needed in special situations*/
+"check_for_working_webdav" => true,
+
+/* Check if .htaccess protection of data is working correctly. Can be disabled if not needed in special situations*/
+"check_for_working_htaccess" => true,
+
 /* Place to log to, can be owncloud and syslog (owncloud is log menu item in admin menu) */
 "log_type" => "owncloud",
 
diff --git a/lib/private/util.php b/lib/private/util.php
index 6c0a8d7bab..dbe0dc4f6a 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'),
 		);