summaryrefslogtreecommitdiff
path: root/ext/pdo_sqlite
diff options
context:
space:
mode:
authorXinchen Hui <laruence@gmail.com>2016-01-04 05:39:20 -0800
committerXinchen Hui <laruence@gmail.com>2016-01-04 05:39:20 -0800
commitc1b73ff8af25971f3ef56260c8907eb412584f32 (patch)
tree4ae8af37f91226def70cfbe6410b92ca5a23ab4f /ext/pdo_sqlite
parent1265c82b1cd618620641bf5355d838394055f1df (diff)
parent36b4311edd3e2dec31de1582c207e83b09d6f42b (diff)
downloadphp-git-c1b73ff8af25971f3ef56260c8907eb412584f32.tar.gz
Merge branch 'PHP-7.0'
Diffstat (limited to 'ext/pdo_sqlite')
-rw-r--r--ext/pdo_sqlite/sqlite_driver.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/pdo_sqlite/sqlite_driver.c b/ext/pdo_sqlite/sqlite_driver.c
index 98b672e3da..346cdf2f27 100644
--- a/ext/pdo_sqlite/sqlite_driver.c
+++ b/ext/pdo_sqlite/sqlite_driver.c
@@ -301,8 +301,7 @@ static int pdo_sqlite_set_attr(pdo_dbh_t *dbh, zend_long attr, zval *val)
switch (attr) {
case PDO_ATTR_TIMEOUT:
- convert_to_long(val);
- sqlite3_busy_timeout(H->db, Z_LVAL_P(val) * 1000);
+ sqlite3_busy_timeout(H->db, zval_get_long(val) * 1000);
return 1;
}
return 0;