summaryrefslogtreecommitdiff
path: root/php.ini-production
diff options
context:
space:
mode:
authorChris McCafferty <cilefen@gmail.com>2014-11-09 22:30:51 -0500
committerPeter Cowburn <petercowburn@gmail.com>2014-11-19 16:57:47 +0000
commit1e92b24a2aeedfe7679f2d5d92b5cfdb363b549b (patch)
tree10ac4b9da112650e5332e59aa4328a510c49f0b1 /php.ini-production
parenta521d7e1beb5e8e627597a6f735b82a0810dfeff (diff)
downloadphp-git-1e92b24a2aeedfe7679f2d5d92b5cfdb363b549b.tar.gz
Fix #68355: Inconsistency in example php.ini comments
There are some arbitrary differences between php.ini-production and php.ini-development. This patch corrects the differences.
Diffstat (limited to 'php.ini-production')
-rw-r--r--php.ini-production4
1 files changed, 3 insertions, 1 deletions
diff --git a/php.ini-production b/php.ini-production
index a2a50ea2f8..d886985b85 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -678,7 +678,7 @@ auto_append_file =
; http://php.net/default-mimetype
default_mimetype = "text/html"
-; PHP's default character set is set to empty.
+; PHP's default character set is set to UTF-8.
; http://php.net/default-charset
default_charset = "UTF-8"
@@ -688,10 +688,12 @@ default_charset = "UTF-8"
;internal_encoding =
; PHP input character encoding is set to empty.
+; If empty, default_charset is used.
; http://php.net/input-encoding
;input_encoding =
; PHP output character encoding is set to empty.
+; If empty, default_charset is used.
; mbstring or iconv output handler is used.
; See also output_buffer.
; http://php.net/output-encoding