Skip to content

Commit 1e92b24

Browse files
junowildernesssalathe
authored andcommitted
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.
1 parent a521d7e commit 1e92b24

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

php.ini-development

+2-2
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ auto_append_file =
678678
; http://php.net/default-mimetype
679679
default_mimetype = "text/html"
680680

681-
; PHP's default character set is set to UTF-8
681+
; PHP's default character set is set to UTF-8.
682682
; http://php.net/default-charset
683683
default_charset = "UTF-8"
684684

@@ -764,7 +764,7 @@ enable_dl = Off
764764
; will look for to know it is OK to continue execution. Setting this variable MAY
765765
; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
766766
; http://php.net/cgi.redirect-status-env
767-
;cgi.redirect_status_env =
767+
;cgi.redirect_status_env =
768768

769769
; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's
770770
; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok

php.ini-production

+3-1
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ auto_append_file =
678678
; http://php.net/default-mimetype
679679
default_mimetype = "text/html"
680680

681-
; PHP's default character set is set to empty.
681+
; PHP's default character set is set to UTF-8.
682682
; http://php.net/default-charset
683683
default_charset = "UTF-8"
684684

@@ -688,10 +688,12 @@ default_charset = "UTF-8"
688688
;internal_encoding =
689689

690690
; PHP input character encoding is set to empty.
691+
; If empty, default_charset is used.
691692
; http://php.net/input-encoding
692693
;input_encoding =
693694

694695
; PHP output character encoding is set to empty.
696+
; If empty, default_charset is used.
695697
; mbstring or iconv output handler is used.
696698
; See also output_buffer.
697699
; http://php.net/output-encoding

0 commit comments

Comments
 (0)