diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2007-10-22 22:42:43 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2007-10-22 22:42:43 +0000 |
| commit | f3b5b118b6cc4345b5a0d57c7fe48b022a520a61 (patch) | |
| tree | cb92fe41716128728de0d06b4514fc7207597404 /ext/mssql/php_mssql.c | |
| parent | b3044c49ed8e0e28f085f02b444392936096256f (diff) | |
| download | php-git-f3b5b118b6cc4345b5a0d57c7fe48b022a520a61.tar.gz | |
Fixed bug #4294 (Move *timeout initialization from RINIT to connect time)
Diffstat (limited to 'ext/mssql/php_mssql.c')
| -rw-r--r-- | ext/mssql/php_mssql.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index c0de0b530e..39f5be6fc3 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"); |