summaryrefslogtreecommitdiff
path: root/ext/mssql/php_mssql.c
diff options
context:
space:
mode:
authorFelipe Pena <felipe@php.net>2010-04-21 14:19:27 +0000
committerFelipe Pena <felipe@php.net>2010-04-21 14:19:27 +0000
commit5a7786c63fa6609bcda967385a81452567292807 (patch)
tree3dd37112b48e3c6239360c292d82518589f8e687 /ext/mssql/php_mssql.c
parent45b68febe9246506b0def2b73d4566e9798c2064 (diff)
downloadphp-git-5a7786c63fa6609bcda967385a81452567292807.tar.gz
- Fixed bug #51562 (query timeout in mssql can not be changed per query)
Patch by: ejsmont dot artur at gmail dot com
Diffstat (limited to 'ext/mssql/php_mssql.c')
-rw-r--r--ext/mssql/php_mssql.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index a47d635fe5..aaee1d2789 100644
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -1311,6 +1311,7 @@ PHP_FUNCTION(mssql_query)
mssql_result *result;
int id = -1;
+ dbsettime(MS_SQL_G(timeout));
batchsize = MS_SQL_G(batchsize);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|rl", &query, &query_len, &mssql_link_index, &zbatchsize) == FAILURE) {