Browse files

Increase the overly conservative pcre backtrack limit from 100000 to …

…1000000
  • Loading branch information...
1 parent f7e6e6c commit ba8ce4a6d48b86c14ee8dd8fc700d50fea2bcd5a @rlerdorf rlerdorf committed May 21, 2011
Showing with 6 additions and 5 deletions.
  1. +1 −0 NEWS
  2. +1 −1 ext/pcre/php_pcre.c
  3. +4 −4 ext/standard/tests/general_functions/ini_get_all.phpt
View
1 NEWS
@@ -3,6 +3,7 @@ PHP NEWS
?? ??? 2011, PHP 5.3.7
- Upgraded bundled SQLite to version 3.7.6.2. (Scott)
- Upgraded bundled PCRE to version 8.12. (Scott)
+- Increased the backtrack limit from 100000 to 1000000 (Rasmus)
- Zend Engine:
. Fixed bug #54804 (__halt_compiler and imported namespaces).
View
2 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()
View
8 ext/standard/tests/general_functions/ini_get_all.phpt
@@ -1,7 +1,7 @@
--TEST--
ini_get_all() tests
--INI--
-pcre.backtrack_limit=100000
+pcre.backtrack_limit=1000000
pcre.recursion_limit=100000
--SKIPIF--
<?php if (!extension_loaded("reflection")) die("skip"); ?>
@@ -34,9 +34,9 @@ array(2) {
["pcre.backtrack_limit"]=>
array(3) {
["global_value"]=>
- string(6) "100000"
+ string(6) "1000000"
["local_value"]=>
- string(6) "100000"
+ string(6) "1000000"
["access"]=>
int(7)
}
@@ -52,7 +52,7 @@ array(2) {
}
array(2) {
["pcre.backtrack_limit"]=>
- string(6) "100000"
+ string(6) "1000000"
["pcre.recursion_limit"]=>
string(6) "100000"
}

0 comments on commit ba8ce4a

Please sign in to comment.