diff options
| author | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:38:30 -0400 |
|---|---|---|
| committer | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:38:30 -0400 |
| commit | 1f589a2bd44ba835ad1b009a5d83abd453724829 (patch) | |
| tree | ec84d715d1ff049cc61f5eaf18db21eb7f3bab40 /ext/mssql/php_mssql.c | |
| parent | bb01389fbd53ec1cbcb80d0681a37cca1267891a (diff) | |
| download | php-1f589a2bd44ba835ad1b009a5d83abd453724829.tar.gz | |
Imported Upstream version 5.2.5upstream/5.2.5
Diffstat (limited to 'ext/mssql/php_mssql.c')
| -rw-r--r-- | ext/mssql/php_mssql.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index 51e3d9e63..fdf670af3 100644 --- a/ext/mssql/php_mssql.c +++ b/ext/mssql/php_mssql.c @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.152.2.13.2.4 2007/02/24 02:17:25 helly Exp $ */ +/* $Id: php_mssql.c,v 1.152.2.13.2.5 2007/10/22 22:43:44 iliaa Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -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"); |