summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-09-13 22:39:08 +0200
committerGitHub <noreply@github.com>2016-09-13 22:39:08 +0200
commite39e1bdf4e130f727bb68cf4f0825d008d97c958 (patch)
tree9528ab093f63ba187605fbb5e2ad6d9448557f28 /lib
parentedb4a680e05707dded4d61434a210f4082ea4856 (diff)
parenta3c8534b7b0a9446cf6fdb0a5a3cb7e5b69745de (diff)
downloadnextcloud-server-e39e1bdf4e130f727bb68cf4f0825d008d97c958.tar.gz
nextcloud-server-e39e1bdf4e130f727bb68cf4f0825d008d97c958.zip
Merge pull request #1395 from nextcloud/issue-369-htaccess-max-sizes
Make sure memory limit is > post size and upload filesize
Diffstat (limited to 'lib')
-rw-r--r--lib/private/IntegrityCheck/Checker.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/IntegrityCheck/Checker.php b/lib/private/IntegrityCheck/Checker.php
index 1db20772b4e..102fe42a99d 100644
--- a/lib/private/IntegrityCheck/Checker.php
+++ b/lib/private/IntegrityCheck/Checker.php
@@ -195,7 +195,7 @@ class Checker {
copy($this->environmentHelper->getServerRoot() . '/.htaccess', $tmpFolder . '/.htaccess');
copy($this->environmentHelper->getServerRoot() . '/.user.ini', $tmpFolder . '/.user.ini');
\OC_Files::setUploadLimit(
- \OCP\Util::computerFileSize('513MB'),
+ \OCP\Util::computerFileSize('511MB'),
[
'.htaccess' => $tmpFolder . '/.htaccess',
'.user.ini' => $tmpFolder . '/.user.ini',