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

time)

diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index 442c4702a91905fbf824a67fe38cbf946d246ca0..f3eddd4d82118657544879fc36fe0b9706bd88df 100644 (file)
--- 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");