aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2015-09-09 11:00:44 +0200
committerTristan Darricau <tristan.darricau@sensiolabs.com>2015-09-09 11:00:44 +0200
commit1affd348145888e3510f1763b314008313b6b8a2 (patch)
treef19693521ee83effd67ecc4772b098482c09f415 /phpBB
parent90d5eefccffce86e1c8ae857080a0ed25f7a79db (diff)
parentea594d00f750843997fcbbd829a64c8cc983fca2 (diff)
downloadforums-1affd348145888e3510f1763b314008313b6b8a2.tar
forums-1affd348145888e3510f1763b314008313b6b8a2.tar.gz
forums-1affd348145888e3510f1763b314008313b6b8a2.tar.bz2
forums-1affd348145888e3510f1763b314008313b6b8a2.tar.xz
forums-1affd348145888e3510f1763b314008313b6b8a2.zip
Merge pull request #3890 from marc1706/ticket/13423
[ticket/13423] Set busyTimeout on connect to prevent db locking * marc1706/ticket/13423: [ticket/13423] Set busyTimeout on connect to prevent db locking
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/phpbb/db/driver/sqlite3.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/driver/sqlite3.php b/phpBB/phpbb/db/driver/sqlite3.php
index 4e3e0d3329..cc3352af34 100644
--- a/phpBB/phpbb/db/driver/sqlite3.php
+++ b/phpBB/phpbb/db/driver/sqlite3.php
@@ -48,6 +48,7 @@ class sqlite3 extends \phpbb\db\driver\driver
try
{
$this->dbo = new \SQLite3($this->server, SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE);
+ $this->dbo->busyTimeout(60000);
$this->db_connect_id = true;
}
catch (\Exception $e)