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.2.14RC1~54
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8aa47cc57de149c235aa0c6d6f7bf8c497250f86;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 e6854c8d8a..7ac95193e6 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,8 @@ PHP                                                                        NEWS
   literal). (cbandy at jbandy dot com)
 - Fixed bug #51607 (pg_copy_from does not allow schema in the tablename
   argument). (cbandy at jbandy dot com)
+- Fixed bug #51562 (query timeout in mssql can not be changed per query).
+  (ejsmont dot artur at gmail dot com)
 - Fixed bug #51445 (var_dump() invalid/slow *RECURSION* detection). (Felipe)
 - Fixed bug #51393 (DateTime::createFromFormat() fails if format string contains
   timezone). (Adam)
diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index 77489be025..449d36b2bf 100644
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -1221,7 +1221,9 @@ PHP_FUNCTION(mssql_query)
 	int id, num_fields;
 	int batchsize;
 
+	dbsettime(MS_SQL_G(timeout));
 	batchsize = MS_SQL_G(batchsize);
+
 	switch(ZEND_NUM_ARGS()) {
 		case 1:
 			if (zend_get_parameters_ex(1, &query)==FAILURE) {