summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2015-03-26 18:17:59 +0100
committerLukas Reschke <lukas@owncloud.com>2015-03-26 18:17:59 +0100
commite90ead2a8dadab6a77e827bec382ebb41f1c4c97 (patch)
tree7871a2038e7068cfdc52769746e3a02de9703b56
parentbc7676089c7e5fe44d4676b51722f4b6c73b11a1 (diff)
parent3232dc76d4b4252ef312285071103bcb1d5d367c (diff)
downloadnextcloud-server-e90ead2a8dadab6a77e827bec382ebb41f1c4c97.tar.gz
nextcloud-server-e90ead2a8dadab6a77e827bec382ebb41f1c4c97.zip
Merge pull request #15231 from owncloud/synchronize-php-setting
Synchronize PHP settings with master
-rw-r--r--.htaccess2
-rw-r--r--.user.ini2
2 files changed, 4 insertions, 0 deletions
diff --git a/.htaccess b/.htaccess
index ba31b6ec378..654bb6c04e7 100644
--- a/.htaccess
+++ b/.htaccess
@@ -13,6 +13,8 @@ php_value post_max_size 513M
php_value memory_limit 512M
php_value mbstring.func_overload 0
php_value always_populate_raw_post_data -1
+php_value default_charset 'UTF-8'
+php_value output_buffering off
<IfModule mod_env.c>
SetEnv htaccessWorking true
</IfModule>
diff --git a/.user.ini b/.user.ini
index 09f6a05ff6c..c5996e8d47e 100644
--- a/.user.ini
+++ b/.user.ini
@@ -3,3 +3,5 @@ post_max_size=513M
memory_limit=512M
mbstring.func_overload=0
always_populate_raw_post_data=-1
+default_charset='UTF-8'
+output_buffering=off