diff options
| author | Chris McCafferty <cilefen@gmail.com> | 2014-11-09 22:30:51 -0500 |
|---|---|---|
| committer | Peter Cowburn <petercowburn@gmail.com> | 2014-11-19 16:57:47 +0000 |
| commit | 1e92b24a2aeedfe7679f2d5d92b5cfdb363b549b (patch) | |
| tree | 10ac4b9da112650e5332e59aa4328a510c49f0b1 | |
| parent | a521d7e1beb5e8e627597a6f735b82a0810dfeff (diff) | |
| download | php-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.
| -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 bcc9ac6baf..d29cc808d2 100644 --- a/php.ini-development +++ b/php.ini-development @@ -678,7 +678,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" @@ -764,7 +764,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 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 |