svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/mssql/php_mssql.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/mssql/php_mssql.c
trunk/ext/mssql/php_mssql.c

felipe Wed, 21 Apr 2010 14:19:27 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=298255 Log: - Fixed bug #51562 (query timeout in mssql can not be changed per query) Patch by: ejsmont dot artur at gmail dot com Bug: http://bugs.php.net/51562 (Open) query timeout in mssql can not be changed per query Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/ext/mssql/php_mssql.c U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/mssql/php_mssql.c U php/php-src/trunk/ext/mssql/php_mssql.c Modified: php/php-src/branches/PHP_5_2/NEWS =================================================================== --- php/php-src/branches/PHP_5_2/NEWS 2010-04-21 14:13:43 UTC (rev 298254) +++ php/php-src/branches/PHP_5_2/NEWS 2010-04-21 14:19:27 UTC (rev 298255) @@ -21,6 +21,8 @@ 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) Modified: php/php-src/branches/PHP_5_2/ext/mssql/php_mssql.c =================================================================== --- php/php-src/branches/PHP_5_2/ext/mssql/php_mssql.c 2010-04-21 14:13:43 UTC (rev 298254) +++ php/php-src/branches/PHP_5_2/ext/mssql/php_mssql.c 2010-04-21 14:19:27 UTC (rev 298255) @@ -1221,7 +1221,9 @@ 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) { Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2010-04-21 14:13:43 UTC (rev 298254) +++ php/php-src/branches/PHP_5_3/NEWS 2010-04-21 14:19:27 UTC (rev 298255) @@ -26,6 +26,8 @@ - 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) Modified: php/php-src/branches/PHP_5_3/ext/mssql/php_mssql.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/mssql/php_mssql.c 2010-04-21 14:13:43 UTC (rev 298254) +++ php/php-src/branches/PHP_5_3/ext/mssql/php_mssql.c 2010-04-21 14:19:27 UTC (rev 298255) @@ -1311,6 +1311,7 @@ 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) { Modified: php/php-src/trunk/ext/mssql/php_mssql.c =================================================================== --- php/php-src/trunk/ext/mssql/php_mssql.c 2010-04-21 14:13:43 UTC (rev 298254) +++ php/php-src/trunk/ext/mssql/php_mssql.c 2010-04-21 14:19:27 UTC (rev 298255) @@ -1311,6 +1311,7 @@ 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) {