Merge pull request #471 from hnk/patch-1

Set PHPs default charset to UTF-8, since we use it. Closes #367.
2015-06-30 12:00:27 -04:00 · 2015-06-30 12:00:27 -04:00 · c0ddceb2bd
parent 42a506231b ca5d228be6
commit c0ddceb2bd
1 changed files with 4 additions and 0 deletions
--- a/setup/web.sh
+++ b/setup/web.sh
@ -36,6 +36,10 @@ tools/editconf.py /etc/nginx/nginx.conf -s \
 tools/editconf.py /etc/php5/fpm/php.ini -c ';' \
 	expose_php=Off

+# Set PHPs default charset to UTF-8, since we use it. See #367.
+tools/editconf.py /etc/php5/fpm/php.ini -c ';' \
+        default_charset="UTF-8"
+
 # Bump up PHP's max_children to support more concurrent connections
 tools/editconf.py /etc/php5/fpm/pool.d/www.conf -c ';' \
 	pm.max_children=8