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
commitba8ce4a6d48b86c14ee8dd8fc700d50fea2bcd5a (patch)
treef5ae3e89532f024d6afb21f7995e7eb589c8537e /ext/pcre/php_pcre.c
parentf7e6e6cedfc506457e941dc58084f5745e3af4c8 (diff)
downloadphp-git-ba8ce4a6d48b86c14ee8dd8fc700d50fea2bcd5a.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 a2851716b0..24fde97545 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()