summaryrefslogtreecommitdiff
path: root/php.ini-development
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2019-04-01 00:32:49 -0700
committerStanislav Malyshev <stas@php.net>2019-04-01 00:32:49 -0700
commit63e0c220374733947ed869597ecf81ea2de138b2 (patch)
treeb0fa5adf57f3cf377dc9020a56f2bc9376a8fee4 /php.ini-development
parent9a06876072b9ccb023d4a14426ccb587f10882f3 (diff)
parent0eea9a642941ab5d4c612f8092f186977afbb73e (diff)
downloadphp-git-63e0c220374733947ed869597ecf81ea2de138b2.tar.gz
Merge branch 'PHP-7.4'
* PHP-7.4: Unfortunately, travis CI has old oniguruma library 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 0bf89f4543..766e8ec3d3 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -1686,6 +1686,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