diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/mssql/php_mssql.c | 1 |
2 files changed, 3 insertions, 0 deletions
@@ -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) { |