[Pkg-owncloud-commits] [owncloud] 03/04: backport https://github.com/owncloud/core/pull/3329

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v4.5.11
in repository owncloud.

commit ea71a5a781c807ad7ee976f6adf05830f17a1a44
Author: Frank Karlitschek <frank at owncloud.org>
Date:   Mon May 13 03:24:54 2013 +0200

    backport https://github.com/owncloud/core/pull/3329
---
 lib/MDB2/Driver/sqlite3.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/MDB2/Driver/sqlite3.php b/lib/MDB2/Driver/sqlite3.php
index 9757e4f..af64b4b 100644
--- a/lib/MDB2/Driver/sqlite3.php
+++ b/lib/MDB2/Driver/sqlite3.php
@@ -388,7 +388,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common
         $php_errormsg = '';
 		$this->connection = new SQLite3($database_file);
 		if(is_callable(array($this->connection,'busyTimeout'))) {//busy timout is only available in php>=5.3
-			$this->connection->busyTimeout(100);
+			$this->connection->busyTimeout(60000);
 		}
         $this->_lasterror = $this->connection->lastErrorMsg();
         if (!$this->connection) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git