]> granicus.if.org Git - php/commitdiff
Increase the overly conservative pcre backtrack limit from 100000 to 1000000
authorRasmus Lerdorf <rasmus@php.net>
Sat, 21 May 2011 19:48:37 +0000 (19:48 +0000)
committerRasmus Lerdorf <rasmus@php.net>
Sat, 21 May 2011 19:48:37 +0000 (19:48 +0000)
ext/pcre/php_pcre.c
ext/standard/tests/general_functions/ini_get_all.phpt

index a9d6ad0ff2acf1c2860ee83a594da9e5fd9703eb..cc96fafe87793c0247f0a5ad33273b1502d122a4 100644 (file)
@@ -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()
 
index a13b0a4751bcf2a4362bedbb1ad40e1a4f07317d..0dcce392ee51d60c93e10d88b216df0882c36568 100644 (file)
@@ -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,9 +52,9 @@ array(2) {
 }
 array(2) {
   ["pcre.backtrack_limit"]=>
-  string(6) "100000"
+  string(6) "1000000"
   ["pcre.recursion_limit"]=>
-  string(6) "100000"
+  string(6) "1000000"
 }
 array(0) {
 }