summaryrefslogtreecommitdiff
path: root/ext/pcre/php_pcre.c
diff options
context:
space:
mode:
authorRasmus Lerdorf <rasmus@php.net>2011-05-21 19:48:37 +0000
committerRasmus Lerdorf <rasmus@php.net>2011-05-21 19:48:37 +0000
commitcebe2a21396c5c23220314b3785231003209c1e5 (patch)
tree6063f14a33a207c9ac9a49daf2fd4ede6aa8bb93 /ext/pcre/php_pcre.c
parentac6edb41ecb219fa399b9295b457de5c9833b7be (diff)
downloadphp-git-cebe2a21396c5c23220314b3785231003209c1e5.tar.gz
Increase the overly conservative pcre backtrack limit from 100000 to 1000000
Diffstat (limited to 'ext/pcre/php_pcre.c')
-rw-r--r--ext/pcre/php_pcre.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index a9d6ad0ff2..cc96fafe87 100644
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -115,7 +115,7 @@ static PHP_GSHUTDOWN_FUNCTION(pcre) /* {{{ */
/* }}} */
PHP_INI_BEGIN()
- STD_PHP_INI_ENTRY("pcre.backtrack_limit", "100000", PHP_INI_ALL, OnUpdateLong, backtrack_limit, zend_pcre_globals, pcre_globals)
+ STD_PHP_INI_ENTRY("pcre.backtrack_limit", "1000000", PHP_INI_ALL, OnUpdateLong, backtrack_limit, zend_pcre_globals, pcre_globals)
STD_PHP_INI_ENTRY("pcre.recursion_limit", "100000", PHP_INI_ALL, OnUpdateLong, recursion_limit, zend_pcre_globals, pcre_globals)
PHP_INI_END()