com php-src: Fix #68355: Inconsistency in example php.ini comments: php.ini-development php.ini-production
| From: | Peter Cowburn | Date: | Wed, 19 Nov 2014 16:57:47 +0000 |
| Subject: | com php-src: Fix #68355: Inconsistency in example php.ini comments: php.ini-development php.ini-production | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83153@lists.php.net to get a copy of this message | ||
Commit: 1e92b24a2aeedfe7679f2d5d92b5cfdb363b549b
Author: Chris McCafferty <cilefen@gmail.com> Sun, 9 Nov 2014 22:30:51 -0500
Committer: Peter Cowburn <petercowburn@gmail.com> Wed, 19 Nov 2014 16:57:47 +0000
Parents: a521d7e1beb5e8e627597a6f735b82a0810dfeff
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1e92b24a2aeedfe7679f2d5d92b5cfdb363b549b
Log:
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.
Bugs:
https://bugs.php.net/68355
Changed paths:
M php.ini-development
M php.ini-production
Diff:
diff --git a/php.ini-development b/php.ini-development
index bcc9ac6..d29cc80 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 a2a50ea..d886985 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