From: Rasmus Lerdorf <rasmus@php.net>
Date: Sat, 21 May 2011 19:48:37 +0000 (+0000)
Subject: Increase the overly conservative pcre backtrack limit from 100000 to 1000000
X-Git-Tag: php-5.4.0alpha1~149
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f5a9e17f9cedaa5e0135698acc7b57b06f05bc75;p=php

Increase the overly conservative pcre backtrack limit from 100000 to 1000000
---

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()
 
diff --git a/ext/standard/tests/general_functions/ini_get_all.phpt b/ext/standard/tests/general_functions/ini_get_all.phpt
index a13b0a4751..0dcce392ee 100644
--- a/ext/standard/tests/general_functions/ini_get_all.phpt
+++ b/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,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) {
 }