diff options
| author | Peter Cowburn <petercowburn@gmail.com> | 2014-11-19 17:06:59 +0000 |
|---|---|---|
| committer | Peter Cowburn <petercowburn@gmail.com> | 2014-11-19 17:06:59 +0000 |
| commit | f7674519804dc7000a56ef9fe12c49461ff0333a (patch) | |
| tree | 01f7da663fb57f91bd4eb84583314f3cb1e02ba4 | |
| parent | cf00c1b2e7efbf7954ada39d87b8de7f80d30570 (diff) | |
| parent | 48c0cf7df6c5fd11148c8a5a9b6362fd99dea4e3 (diff) | |
| download | php-git-f7674519804dc7000a56ef9fe12c49461ff0333a.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
Fix #68355: Inconsistency in example php.ini comments
| -rw-r--r-- | php.ini-development | 4 | ||||
| -rw-r--r-- | php.ini-production | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/php.ini-development b/php.ini-development index 61519f05aa..a3cb5a3b78 100644 --- a/php.ini-development +++ b/php.ini-development @@ -674,7 +674,7 @@ auto_append_file = ; http://php.net/default-mimetype default_mimetype = "text/html" -; PHP's default character set is set to UTF-8 +; PHP's default character set is set to UTF-8. ; http://php.net/default-charset default_charset = "UTF-8" @@ -753,7 +753,7 @@ enable_dl = Off ; will look for to know it is OK to continue execution. Setting this variable MAY ; cause security issues, KNOW WHAT YOU ARE DOING FIRST. ; http://php.net/cgi.redirect-status-env -;cgi.redirect_status_env = +;cgi.redirect_status_env = ; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's ; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok diff --git a/php.ini-production b/php.ini-production index a455b825b5..15d432564f 100644 --- a/php.ini-production +++ b/php.ini-production @@ -674,7 +674,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" @@ -684,10 +684,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 |