Merge branch 'PHP-7.4' into PHP-8.0

nikic · nikic · commit 0dac69c05994 · 2020-11-20T16:50:52.000+01:00
* PHP-7.4:
  Fix typos in php.ini files
diff --git a/php.ini-development b/php.ini-development
@@ -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 =
 
diff --git a/php.ini-production b/php.ini-production
@@ -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 =
 
