From: Antony Dovgal Date: Thu, 12 Apr 2007 12:31:02 +0000 (+0000) Subject: swap the options X-Git-Tag: RELEASE_1_1_0~9 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb7e31c17a0af4ada74c9166b99ff4f274d9107b;p=php swap the options --- diff --git a/php.ini-dist b/php.ini-dist index bea8bfbcec..9a51e9b261 100644 --- a/php.ini-dist +++ b/php.ini-dist @@ -587,13 +587,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 8134f21e57..1cc0c9fff4 100644 --- a/php.ini-recommended +++ b/php.ini-recommended @@ -618,13 +618,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,