From: Ilia Alshanetsky <iliaa@php.net>
Date: Mon, 22 Oct 2007 22:43:44 +0000 (+0000)
Subject: MFB: Fixed bug #4294 (Move *timeout initialization from RINIT to connect
X-Git-Tag: php-5.2.5RC2~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=521048a9aebbe9355cf9d6c7eb0cbb6f719e1e65;p=php

MFB: Fixed bug #4294 (Move *timeout initialization from RINIT to connect
time)
---

diff --git a/NEWS b/NEWS
index 5fce184c49..fe2a66dfae 100644
--- a/NEWS
+++ b/NEWS
@@ -39,6 +39,8 @@ PHP                                                                        NEWS
 
 - Fixed bug #43020 (Warning message is missing with shuffle() and more
   than one argument). (Scott)
+- Fixed bug #4294 (Move *timeout initialization from RINIT to connect time).
+  (Ilia)
 - Fixed bug #42917 (PDO::FETCH_KEY_PAIR doesn't work with setFetchMode).
   (Ilia)
 - Fixed bug #42890 (Constant "LIST" defined by mysqlclient and c-client).
diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index 417c3110c4..cf5bf23316 100644
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -345,9 +345,7 @@ PHP_RINIT_FUNCTION(mssql)
 	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 @@ static void php_mssql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 		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");