summaryrefslogtreecommitdiff
path: root/php.ini-development
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2019-04-01 00:05:36 -0700
committerStanislav Malyshev <stas@php.net>2019-04-01 00:05:36 -0700
commit077ce33aa98d3c428c968091002cdbd559a8fc58 (patch)
treecb385eb3dba3bc71beb5c942bf9b9732e2a3a7cc /php.ini-development
parent9dcf95ab76fb01ea905369efec0ea2ac54ffade7 (diff)
parent3d5b6f234e3172b193856aec23fd3f6cf14e464b (diff)
downloadphp-git-077ce33aa98d3c428c968091002cdbd559a8fc58.tar.gz
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Update NEWS & UPGRADING Add fallbacks for older oniguruma versions Add mbstring.regex_stack_limit to php.ini-* Implement RF bug #72777 - ensure stack limits on mbstring functions.
Diffstat (limited to 'php.ini-development')
-rw-r--r--php.ini-development5
1 files changed, 5 insertions, 0 deletions
diff --git a/php.ini-development b/php.ini-development
index a058c0495c..138ed5e542 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -1712,6 +1712,11 @@ zend.assertions = 1
; Default: mbstring.http_output_conv_mimetype=^(text/|application/xhtml\+xml)
;mbstring.http_output_conv_mimetype=
+; This directive specifies maximum stack depth for mbstring regular expressions. It is similar
+; to the pcre.recursion_limit for PCRE.
+; Default: 100000
+;mbstring.regex_stack_limit=100000
+
[gd]
; Tell the jpeg decode to ignore warnings and try to create
; a gd image. The warning will then be displayed as notices