aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2015-09-09 11:01:03 +0200
committerTristan Darricau <tristan.darricau@sensiolabs.com>2015-09-09 11:01:03 +0200
commit23205ca0cc8c71e17b4a514dffb474e9c28bd585 (patch)
treede6c0e1f56660227fcef8579ac0db4dc5f501a62
parentdccc0877c1cc34826c5178247a06e8c1ca7702a0 (diff)
parent1affd348145888e3510f1763b314008313b6b8a2 (diff)
downloadforums-23205ca0cc8c71e17b4a514dffb474e9c28bd585.tar
forums-23205ca0cc8c71e17b4a514dffb474e9c28bd585.tar.gz
forums-23205ca0cc8c71e17b4a514dffb474e9c28bd585.tar.bz2
forums-23205ca0cc8c71e17b4a514dffb474e9c28bd585.tar.xz
forums-23205ca0cc8c71e17b4a514dffb474e9c28bd585.zip
Merge branch '3.1.x'
* 3.1.x: [ticket/13423] Set busyTimeout on connect to prevent db locking
-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 f5c2dd225b..b7f6e60337 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)