summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--php.ini-dist6
-rw-r--r--php.ini-recommended6
2 files changed, 12 insertions, 0 deletions
diff --git a/php.ini-dist b/php.ini-dist
index f5e15ec6f6..00eb585f36 100644
--- a/php.ini-dist
+++ b/php.ini-dist
@@ -660,7 +660,13 @@ default_socket_timeout = 60
;xmlrpc_errors = 0
[Pcre]
+;PCRE library backtracking limit.
;pcre.recursion_limit=100000
+
+;PCRE library recursion limit.
+;Please note that if you set this value to a high number you may consume all
+;the available process stack and eventually crash PHP (due to reaching the
+;stack size limit imposed by the Operating System).
;pcre.backtrack_limit=100000
[Syslog]
diff --git a/php.ini-recommended b/php.ini-recommended
index 6e123a3ccb..e0d02461ce 100644
--- a/php.ini-recommended
+++ b/php.ini-recommended
@@ -705,7 +705,13 @@ default_socket_timeout = 60
;xmlrpc_errors = 0
[Pcre]
+;PCRE library backtracking limit.
;pcre.recursion_limit=100000
+
+;PCRE library recursion limit.
+;Please note that if you set this value to a high number you may consume all
+;the available process stack and eventually crash PHP (due to reaching the
+;stack size limit imposed by the Operating System).
;pcre.backtrack_limit=100000
[Syslog]