Index: branches/unlabeled/unlabeled-1.39.2/kernel/startup.php
===================================================================
diff -u -N -r4564 -r4565
--- branches/unlabeled/unlabeled-1.39.2/kernel/startup.php	(.../startup.php)	(revision 4564)
+++ branches/unlabeled/unlabeled-1.39.2/kernel/startup.php	(.../startup.php)	(revision 4565)
@@ -65,7 +65,7 @@
 if( file_exists(FULL_PATH.'/debug.php') && !defined('DEBUG_MODE') ) include_once(FULL_PATH.'/debug.php');
 if( !defined('DEBUG_MODE') ) error_reporting(0);
 
-ini_set('memory_limit', constOn('IS_INSTALL') ? -1 : '32M');
+ini_set('memory_limit', '32M');
 ini_set('include_path', '.');
 
 $kernel_version = "1.0.0";
Index: branches/unlabeled/unlabeled-1.100.2/admin/install.php
===================================================================
diff -u -N -r4564 -r4565
--- branches/unlabeled/unlabeled-1.100.2/admin/install.php	(.../install.php)	(revision 4564)
+++ branches/unlabeled/unlabeled-1.100.2/admin/install.php	(.../install.php)	(revision 4565)
@@ -1,8 +1,7 @@
 <?php
 
 error_reporting(E_ALL);
-set_time_limit(0);
-ini_set('memory_limit', -1);
+ini_set('max_execution_time', 0);
 
 define('BACKUP_NAME', 'dump(.*).txt'); // how backup dump files are named
 $general_error = '';
@@ -722,9 +721,7 @@
 		$css_item->Compile();
 		$application->DB->Query( sprintf($theme_update_sql, $stylesheet_id, $application->DB->qstr( getArrayValue($css_hash,$stylesheet_id) ) ) );
 	}
-	
-	// do redirect, because upgrade scripts can eat a lot or memory used for language pack upgrade operation
-	$application->Redirect('install', Array('state' => 'languagepack_upgrade'), '', 'install.php');
+	$application->Done();
 	// compile stylesheets: end
 
     $state = 'languagepack_upgrade';