From: Felipe Pena <felipe@php.net>
Date: Wed, 21 Apr 2010 14:19:27 +0000 (+0000)
Subject: - Fixed bug #51562 (query timeout in mssql can not be changed per query)
X-Git-Tag: php-5.3.3RC1~285
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a7786c63fa6609bcda967385a81452567292807;p=php

- Fixed bug #51562 (query timeout in mssql can not be changed per query)
  Patch by: ejsmont dot artur at gmail dot com
---

diff --git a/NEWS b/NEWS
index 7b533f1a9c..dd3e2562fe 100644
--- a/NEWS
+++ b/NEWS
@@ -26,6 +26,8 @@ PHP                                                                        NEWS
 - Fixed bug #51607 (pg_copy_from does not allow schema in the tablename
   argument). (cbandy at jbandy dot com)
 - Fixed bug #51590 (JSON_ERROR_UTF8 is undefined). (Felipe)
+- Fixed bug #51562 (query timeout in mssql can not be changed per query).
+  (ejsmont dot artur at gmail dot com)
 - Fixed bug #51577 (Uninitialized memory reference with oci_bind_array_by_name)
   (Oracle Corp.)
 - Fixed bug #51445 (var_dump() invalid/slow *RECURSION* detection). (Felipe)
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) {