iliaa Mon Oct 22 22:42:43 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mssql php_mssql.c
Log:
Fixed bug #4294 (Move *timeout initialization from RINIT to connect time)
http://cvs.php.net/viewvc.cgi/php-src/ext/mssql/php_mssql.c?r1=1.152.2.13.2.4.2.1&r2=1.152.2.13.2.4.2.2&diff_format=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.152.2.13.2.4.2.1
php-src/ext/mssql/php_mssql.c:1.152.2.13.2.4.2.2
--- php-src/ext/mssql/php_mssql.c:1.152.2.13.2.4.2.1 Thu Sep 27 18:00:41 2007
+++ php-src/ext/mssql/php_mssql.c Mon Oct 22 22:42:43 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mssql.c,v 1.152.2.13.2.4.2.1 2007/09/27 18:00:41 dmitry Exp $ */
+/* $Id: php_mssql.c,v 1.152.2.13.2.4.2.2 2007/10/22 22:42:43 iliaa Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -345,9 +345,7 @@
MS_SQL_G(min_error_severity) = MS_SQL_G(cfg_min_error_severity);
MS_SQL_G(min_message_severity) = MS_SQL_G(cfg_min_message_severity);
if (MS_SQL_G(connect_timeout) < 1) MS_SQL_G(connect_timeout) = 1;
- dbsetlogintime(MS_SQL_G(connect_timeout));
if (MS_SQL_G(timeout) < 0) MS_SQL_G(timeout) = 60;
- dbsettime(MS_SQL_G(timeout));
if (MS_SQL_G(max_procs) != -1) {
dbsetmaxprocs((TDS_SHORT)MS_SQL_G(max_procs));
}
@@ -468,6 +466,9 @@
RETURN_FALSE;
}
+ dbsetlogintime(MS_SQL_G(connect_timeout));
+ dbsettime(MS_SQL_G(timeout));
+
/* set a DBLOGIN record */
if ((mssql.login = dblogin()) == NULL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to allocate
login record");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
