Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix typos in php.ini files
This commit is contained in:
Nikita Popov 2020-11-20 16:50:52 +01:00
commit 0dac69c059
2 changed files with 2 additions and 2 deletions

View File

@ -1637,7 +1637,7 @@ zend.assertions = 1
; http input encoding.
; mbstring.encoding_translation = On is needed to use this setting.
; If empty, default_charset or input_encoding or mbstring.input is used.
; The precedence is: default_charset < input_encoding < mbsting.http_input
; The precedence is: default_charset < input_encoding < mbstring.http_input
; http://php.net/mbstring.http-input
;mbstring.http_input =

View File

@ -1639,7 +1639,7 @@ zend.assertions = -1
; http input encoding.
; mbstring.encoding_translation = On is needed to use this setting.
; If empty, default_charset or input_encoding or mbstring.input is used.
; The precedence is: default_charset < input_encoding < mbsting.http_input
; The precedence is: default_charset < input_encoding < mbstring.http_input
; http://php.net/mbstring.http-input
;mbstring.http_input =