From: Antony Dovgal <tony2001@php.net>
Date: Thu, 12 Apr 2007 12:31:39 +0000 (+0000)
Subject: MFH
X-Git-Tag: php-5.2.2RC2~106
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d1a190beea4925f709f1ee97dfb0800b47f30cf5;p=php

MFH
---

diff --git a/php.ini-dist b/php.ini-dist
index 00eb585f36..2ad7e817e5 100644
--- a/php.ini-dist
+++ b/php.ini-dist
@@ -661,13 +661,13 @@ default_socket_timeout = 60
 
 [Pcre]
 ;PCRE library backtracking limit.
-;pcre.recursion_limit=100000
+;pcre.backtrack_limit=100000
 
 ;PCRE library recursion limit. 
 ;Please note that if you set this value to a high number you may consume all 
 ;the available process stack and eventually crash PHP (due to reaching the 
 ;stack size limit imposed by the Operating System).
-;pcre.backtrack_limit=100000
+;pcre.recursion_limit=100000
 
 [Syslog]
 ; Whether or not to define the various syslog variables (e.g. $LOG_PID,
diff --git a/php.ini-recommended b/php.ini-recommended
index e0d02461ce..1ee9101a23 100644
--- a/php.ini-recommended
+++ b/php.ini-recommended
@@ -706,13 +706,13 @@ default_socket_timeout = 60
 
 [Pcre]
 ;PCRE library backtracking limit.
-;pcre.recursion_limit=100000
+;pcre.backtrack_limit=100000
 
 ;PCRE library recursion limit. 
 ;Please note that if you set this value to a high number you may consume all 
 ;the available process stack and eventually crash PHP (due to reaching the 
 ;stack size limit imposed by the Operating System).
-;pcre.backtrack_limit=100000
+;pcre.recursion_limit=100000
 
 [Syslog]
 ; Whether or not to define the various syslog variables (e.g. $LOG_PID,