extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-20 12:58:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

try to increase/double prce.backtrack_limit no failure to preg_replace up to 1/4 of memory_limit

Browse Source 
previous code was adding max 10 time 10000 to default limit of 1000000, which increased it by 10% max, given we have now a default memory_limit of 128M
This commit is contained in:
Ralf Becker 2014-11-14 19:08:18 +00:00
parent 4ce9b93bb2
commit 08ab6679d2
1 changed files with 43 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
etemplate/inc/class.bo_merge.inc.php
View File

@ -1102,21 +1102,45 @@ abstract class bo_merge
if($format && $names) if($format && $names)
{ {
// Dealing with backtrack limit per AmigoJack 10-Jul-2010 comment on php.net preg-replace docs // Dealing with backtrack limit per AmigoJack 10-Jul-2010 comment on php.net preg-replace docs
$increase = 0; do {
while($increase < 10) { $result = preg_replace($format, $replacement, $content, -1);
$result = preg_replace($format, $replacement, $content, -1, $count); }
if( preg_last_error()== PREG_BACKTRACK_LIMIT_ERROR ) { // Only check on backtrack limit failure // try to increase/double pcre.backtrack_limit failure
ini_set( 'pcre.backtrack_limit', (int)ini_get( 'pcre.backtrack_limit' )+ 10000 ); // Get current limit and increase while(preg_last_error() == PREG_BACKTRACK_LIMIT_ERROR && self::increase_backtrack_limit());
$increase++; // Do not overkill the server
} else { // No fail if ($result) $content = $result; // On failure $result would be NULL
$content = $result; // On failure $result would be NULL
break; // Exit loop
} }
} }
if($increase == 10) {
error_log('Backtrack limit exceeded @ ' . ini_get('pcre.backtrack_limit') . ', some cells left as text.'); /**
* Increase/double prce.backtrack_limit up to 1/4 of memory_limit
*
* @return boolean true: backtrack_limit increased, may try again, false limit already to high
*/
protected static function increase_backtrack_limit()
{
static $backtrack_limit=null,$memory_limit=null;
if (!isset($backtrack_limit))
{
$backtrack_limit = ini_get('pcre.backtrack_limit');
}
if (!isset($memory_limit))
{
$memory_limit = ini_get('memory_limit');
switch(strtoupper(substr($memory_limit, -1)))
{
case 'G': $memory_limit *= 1024;
case 'M': $memory_limit *= 1024;
case 'K': $memory_limit *= 1024;
} }
} }
if ($backtrack_limit < $memory_limit/8)
{
ini_set( 'pcre.backtrack_limit', $backtrack_limit*=2);
return true;
}
error_log("pcre.backtrack_limit exceeded @ $backtrack_limit, some cells left as text.");
return false;
} }
/** /**
@ -1209,20 +1233,13 @@ abstract class bo_merge
if($format && $names) if($format && $names)
{ {
// Dealing with backtrack limit per AmigoJack 10-Jul-2010 comment on php.net preg-replace docs // Dealing with backtrack limit per AmigoJack 10-Jul-2010 comment on php.net preg-replace docs
$increase = 0; do {
while($increase < 10) { $result = preg_replace($format, $replacement, $content, -1);
$result = preg_replace($format, $replacement, $content, -1, $count);
if( preg_last_error()== PREG_BACKTRACK_LIMIT_ERROR ) { // Only check on backtrack limit failure
ini_set( 'pcre.backtrack_limit', (int)ini_get( 'pcre.backtrack_limit' )+ 10000 ); // Get current limit and increase
$increase++; // Do not overkill the server
} else { // No fail
$content = $result; // On failure $result would be NULL
break; // Exit loop
}
}
if($increase == 10) {
error_log('Backtrack limit exceeded @ ' . ini_get('pcre.backtrack_limit') . ', some cells left as text.');
} }
// try to increase/double pcre.backtrack_limit failure
while(preg_last_error() == PREG_BACKTRACK_LIMIT_ERROR && self::increase_backtrack_limit());
if ($result) $content = $result; // On failure $result would be NULL
} }
} }