- 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 e6854c8d8a84d9758513c301d2aaaeba0c8984e2..7ac95193e6b66f705d5b29e52dfb49c1f4248fd9 100644 (file)
--- 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 77489be0259d1baf2e4ec2d3afc06c337daea462..449d36b2bfc326b0469d1d0329ccfc8c7097d93f 100644 (file)
--- 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) {