summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-01-08 11:08:24 +0100
committerMorris Jobke <hey@morrisjobke.de>2015-01-08 11:08:24 +0100
commit14e534e93322d3ce3275f04657de40fcf34d61d9 (patch)
treed1944a3986d99c7fe1fc9e3f0042fb2ffd9710c7
parent6bda95037f29bd1bbef8686a964710e2217af318 (diff)
parent296a8520639ebd69212a38e308b307a8c134ef4f (diff)
downloadnextcloud-server-14e534e93322d3ce3275f04657de40fcf34d61d9.tar.gz
nextcloud-server-14e534e93322d3ce3275f04657de40fcf34d61d9.zip
Merge pull request #13166 from owncloud/support-setup-in-php-dev-server
check for working htaccess will result in a dead lock because the server...
-rw-r--r--lib/private/util.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/private/util.php b/lib/private/util.php
index 53c9fbfd56b..3178639b02e 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -1031,6 +1031,11 @@ class OC_Util {
return true;
}
+ // php dev server does not support htaccess
+ if (php_sapi_name() === 'cli-server') {
+ return false;
+ }
+
// testdata
$fileName = '/htaccesstest.txt';
$testContent = 'testcontent';