archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-5.6'

Browse source 
* PHP-5.6:
  NEWS
  Fix #68355: Inconsistency in example php.ini comments
This commit is contained in:
Peter Cowburn 2014-11-19 17:06:59 +00:00
commit f767451980
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
php.ini-development
View file

@ -674,7 +674,7 @@ auto_append_file =
; http://php.net/default-mimetype ; http://php.net/default-mimetype
default_mimetype = "text/html" 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 ; http://php.net/default-charset
default_charset = "UTF-8" default_charset = "UTF-8"

4
php.ini-production
View file

@ -674,7 +674,7 @@ auto_append_file =
; http://php.net/default-mimetype ; http://php.net/default-mimetype
default_mimetype = "text/html" 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 ; http://php.net/default-charset
default_charset = "UTF-8" default_charset = "UTF-8"
@ -684,10 +684,12 @@ default_charset = "UTF-8"
;internal_encoding = ;internal_encoding =
; PHP input character encoding is set to empty. ; PHP input character encoding is set to empty.
; If empty, default_charset is used.
; http://php.net/input-encoding ; http://php.net/input-encoding
;input_encoding = ;input_encoding =
; PHP output character encoding is set to empty. ; PHP output character encoding is set to empty.
; If empty, default_charset is used.
; mbstring or iconv output handler is used. ; mbstring or iconv output handler is used.
; See also output_buffer. ; See also output_buffer.
; http://php.net/output-encoding ; http://php.net/output-encoding