Skip to content

Commit 7bb0e71

Browse files
kevincuppclaudepache
authored andcommitted
Document mbstring.regex_retry_limit and mbstring.regex_stack_limit directives
Closes phpGH-1865.
1 parent d64734f commit 7bb0e71

File tree

2 files changed

+40
-2
lines changed

2 files changed

+40
-2
lines changed

appendices/migration82/other-changes.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,8 @@
252252
<member><link linkend="ini.ldap.max_links">ldap.max_links</link></member>
253253
<member><link linkend="ini.max-input-nesting-level">max_input_nesting_level</link></member>
254254
<member><link linkend="ini.max-input-vars">max_input_vars</link></member>
255-
<member>mbstring.regex_retry_limit</member>
256-
<member>mbstring.regex_stack_limit</member>
255+
<member><link linkend="ini.mbstring.regex-retry-limit">mbstring.regex_retry_limit</link></member>
256+
<member><link linkend="ini.mbstring.regex-stack-limit">mbstring.regex_stack_limit</link></member>
257257
<member><link linkend="ini.mysqli.allow-local-infile">mysqli.allow_local_infile</link></member>
258258
<member><link linkend="ini.mysqli.allow-persistent">mysqli.allow_persistent</link></member>
259259
<member><link linkend="ini.mysqli.default-port">mysqli.default_port</link></member>

reference/mbstring/ini.xml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,18 @@
7878
<entry>PHP_INI_ALL</entry>
7979
<entry></entry>
8080
</row>
81+
<row>
82+
<entry><link linkend="ini.mbstring.regex-retry-limit">mbstring.regex_retry_limit</link></entry>
83+
<entry>"1000000"</entry>
84+
<entry>PHP_INI_ALL</entry>
85+
<entry>Available as of PHP 7.4.0.</entry>
86+
</row>
87+
<row>
88+
<entry><link linkend="ini.mbstring.regex-stack-limit">mbstring.regex_stack_limit</link></entry>
89+
<entry>"100000"</entry>
90+
<entry>PHP_INI_ALL</entry>
91+
<entry>Available as of PHP 7.3.5.</entry>
92+
</row>
8193
</tbody>
8294
</tgroup>
8395
</table>
@@ -235,6 +247,32 @@
235247
</para>
236248
</listitem>
237249
</varlistentry>
250+
<varlistentry xml:id="ini.mbstring.regex-retry-limit">
251+
<term>
252+
<parameter>mbstring.regex_retry_limit</parameter>
253+
<type>int</type>
254+
</term>
255+
<listitem>
256+
<para>
257+
Limits the amount of backtracking that may be performed during one mbregex
258+
match.
259+
</para>
260+
<para>
261+
This setting only takes effect when linking against oniguruma >= 6.8.0.
262+
</para>
263+
</listitem>
264+
</varlistentry>
265+
<varlistentry xml:id="ini.mbstring.regex-stack-limit">
266+
<term>
267+
<parameter>mbstring.regex_stack_limit</parameter>
268+
<type>int</type>
269+
</term>
270+
<listitem>
271+
<para>
272+
Limits the stack depth of mbstring regular expressions.
273+
</para>
274+
</listitem>
275+
</varlistentry>
238276
</variablelist>
239277
</para>
240278

0 commit comments

Comments
 (0)