Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
  Fix invalid mbstring config reference

[ci skip]
This commit is contained in:
Nikita Popov 2021-11-10 09:45:26 +01:00
commit 469f8a175a
2 changed files with 4 additions and 4 deletions

View file

@ -1681,8 +1681,8 @@ zend.assertions = -1
; This directive specifies the regex pattern of content types for which mb_output_handler()
; is activated.
; Default: mbstring.http_output_conv_mimetype=^(text/|application/xhtml\+xml)
;mbstring.http_output_conv_mimetype=
; Default: mbstring.http_output_conv_mimetypes=^(text/|application/xhtml\+xml)
;mbstring.http_output_conv_mimetypes=
; This directive specifies maximum stack depth for mbstring regular expressions. It is similar
; to the pcre.recursion_limit for PCRE.