aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/includes/db/mssql.php2
-rwxr-xr-xphpBB/install/index.php2
2 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/db/mssql.php b/phpBB/includes/db/mssql.php
index b28ea01acb..6429d4be41 100644
--- a/phpBB/includes/db/mssql.php
+++ b/phpBB/includes/db/mssql.php
@@ -35,7 +35,7 @@ class dbal_mssql extends dbal
$this->server = $sqlserver . (($port) ? ':' . $port : '');
$this->dbname = $database;
- ini_set('mssql.charset', 'UTF-8');
+ @ini_set('mssql.charset', 'UTF-8');
$this->db_connect_id = ($this->persistency) ? @mssql_pconnect($this->server, $this->user, $sqlpassword) : @mssql_connect($this->server, $this->user, $sqlpassword);
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 0a8a45b771..eb49ac5c9b 100755
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -102,7 +102,9 @@ else
define('STRIP', (get_magic_quotes_gpc()) ? true : false);
}
+// Try to override some limits - maybe it helps some...
@set_time_limit(0);
+@ini_set('memory_limit', '128M');
// Include essential scripts
require($phpbb_root_path . 'includes/functions.' . $phpEx);