sync php.ini with upstream
This commit is contained in:
parent
4a89c832bb
commit
97650a70c0
26
php.ini
26
php.ini
@ -729,6 +729,10 @@ user_dir =
|
||||
; On windows:
|
||||
; extension_dir = "ext"
|
||||
|
||||
; Directory where the temporary files should be placed.
|
||||
; Defaults to the system default (see sys_get_temp_dir)
|
||||
; sys_temp_dir = "/tmp"
|
||||
|
||||
; Whether or not to enable the dl() function. The dl() function does NOT work
|
||||
; properly in multithreaded servers, such as IIS or Zeus, and is automatically
|
||||
; disabled on them.
|
||||
@ -954,16 +958,6 @@ pdo_mysql.default_socket=
|
||||
;phar.cache_list =
|
||||
|
||||
[mail function]
|
||||
; For Win32 only.
|
||||
; http://php.net/smtp
|
||||
SMTP = localhost
|
||||
; http://php.net/smtp-port
|
||||
smtp_port = 25
|
||||
|
||||
; For Win32 only.
|
||||
; http://php.net/sendmail-from
|
||||
;sendmail_from = me@example.com
|
||||
|
||||
; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
|
||||
; http://php.net/sendmail-path
|
||||
sendmail_path = /usr/sbin/sendmail -t -i
|
||||
@ -979,6 +973,8 @@ mail.add_x_header = On
|
||||
; The path to a log file that will log all mail() calls. Log entries include
|
||||
; the full path of the script, line number, To address and headers.
|
||||
;mail.log =
|
||||
; Log mail to syslog (Event Log on NT, not valid in Windows 95).
|
||||
;mail.log = syslog
|
||||
|
||||
[SQL]
|
||||
; http://php.net/sql.safe-mode
|
||||
@ -1663,16 +1659,16 @@ mssql.secure_connection = Off
|
||||
; Some encoding cannot work as internal encoding.
|
||||
; (e.g. SJIS, BIG5, ISO-2022-*)
|
||||
; http://php.net/mbstring.internal-encoding
|
||||
;mbstring.internal_encoding = EUC-JP
|
||||
;mbstring.internal_encoding = UTF-8
|
||||
|
||||
; http input encoding.
|
||||
; http://php.net/mbstring.http-input
|
||||
;mbstring.http_input = auto
|
||||
;mbstring.http_input = UTF-8
|
||||
|
||||
; http output encoding. mb_output_handler must be
|
||||
; registered as output buffer to function
|
||||
; http://php.net/mbstring.http-output
|
||||
;mbstring.http_output = SJIS
|
||||
;mbstring.http_output = pass
|
||||
|
||||
; enable automatic encoding translation according to
|
||||
; mbstring.internal_encoding setting. Input chars are
|
||||
@ -1690,7 +1686,7 @@ mssql.secure_connection = Off
|
||||
; substitute_character used when character cannot be converted
|
||||
; one from another
|
||||
; http://php.net/mbstring.substitute-character
|
||||
;mbstring.substitute_character = none;
|
||||
;mbstring.substitute_character = none
|
||||
|
||||
; overload(replace) single byte functions by mbstring functions.
|
||||
; mail(), ereg(), etc are overloaded by mb_send_mail(), mb_ereg(),
|
||||
@ -1704,7 +1700,7 @@ mssql.secure_connection = Off
|
||||
;mbstring.func_overload = 0
|
||||
|
||||
; enable strict encoding detection.
|
||||
;mbstring.strict_detection = Off
|
||||
;mbstring.strict_detection = On
|
||||
|
||||
; This directive specifies the regex pattern of content types for which mb_output_handler()
|
||||
; is activated.
|
||||
|
Loading…
Reference in New Issue
Block a user