cvs: php-src / php.ini-dist php.ini-recommended

tony2001 Thu Apr 12 12:31:02 2007 UTC Modified files: /php-src php.ini-dist php.ini-recommended Log: swap the options http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.261&r2=1.262&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.261 php-src/php.ini-dist:1.262 --- php-src/php.ini-dist:1.261 Thu Apr 12 10:24:56 2007 +++ php-src/php.ini-dist Thu Apr 12 12:31:02 2007 @@ -587,13 +587,13 @@ [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, http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.210&r2=1.211&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.210 php-src/php.ini-recommended:1.211 --- php-src/php.ini-recommended:1.210 Thu Apr 12 10:24:57 2007 +++ php-src/php.ini-recommended Thu Apr 12 12:31:02 2007 @@ -618,13 +618,13 @@ [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,