From: Chris McCafferty <cilefen@gmail.com>
Date: Mon, 10 Nov 2014 03:30:51 +0000 (-0500)
Subject: Fix #68355: Inconsistency in example php.ini comments
X-Git-Tag: php-5.6.4RC1~55^2~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1e92b24a2aeedfe7679f2d5d92b5cfdb363b549b;p=php

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.
---

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