cvs: php4 /ext/mssql/ php_mssql.c

zeev Mon Jun 12 14:39:51 2000 EDT Modified files: /php4/ext/mssql php_mssql.c Log: @- Fixed an initialization problem in the MS-SQL problem that could cause @ a crash in mssql_query() (Zeev) Index: php4/ext/mssql/php_mssql.c diff -u php4/ext/mssql/php_mssql.c:1.23 php4/ext/mssql/php_mssql.c:1.24 --- php4/ext/mssql/php_mssql.c:1.23 Mon Jun 5 12:47:42 2000 +++ php4/ext/mssql/php_mssql.c Mon Jun 12 14:39:51 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.23 2000/06/05 19:47:42 andi Exp $ */ +/* $Id: php_mssql.c,v 1.24 2000/06/12 21:39:51 zeev Exp $ */ #ifdef COMPILE_DL_MSSQL #include "dl/phpdl.h" @@ -198,6 +198,11 @@ static void php_mssql_init_globals(php_mssql_globals *mssql_globals) { MS_SQL_G(num_persistent) = 0; + if (MS_SQL_G(compatability_mode)) { + MS_SQL_G(get_column_content) = php_mssql_get_column_content_with_type; + } else { + MS_SQL_G(get_column_content) = php_mssql_get_column_content_without_type; + } } #endif @@ -223,11 +228,6 @@ } dberrhandle((DBERRHANDLE_PROC) php_mssql_error_handler); dbmsghandle((DBMSGHANDLE_PROC) php_mssql_message_handler); - if (MS_SQL_G(compatability_mode)) { - MS_SQL_G(get_column_content) = php_mssql_get_column_content_with_type; - } else { - MS_SQL_G(get_column_content) = php_mssql_get_column_content_without_type; - } if (MS_SQL_G(connect_timeout) < 1) MS_SQL_G(connect_timeout) = 1; dbsetlogintime(MS_SQL_G(connect_timeout));