summaryrefslogtreecommitdiff
path: root/ext/mssql/php_mssql.c
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2000-06-12 21:39:51 +0000
committerZeev Suraski <zeev@php.net>2000-06-12 21:39:51 +0000
commit1f0049158a905e3a6977c0e868955a72a96326e5 (patch)
tree5ce164601cf7bc6aaed76866e55a9f3f4e4b56ec /ext/mssql/php_mssql.c
parent6bbf0105af9a1e9f5e647df897179497dca63b86 (diff)
downloadphp-git-1f0049158a905e3a6977c0e868955a72a96326e5.tar.gz
@- Fixed an initialization problem in the MS-SQL problem that could cause
@ a crash in mssql_query() (Zeev)
Diffstat (limited to 'ext/mssql/php_mssql.c')
-rw-r--r--ext/mssql/php_mssql.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index 9dac88a5d9..ca61dc5a5b 100644
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -198,6 +198,11 @@ static void _close_mssql_plink(mssql_link *mssql_ptr)
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 @@ PHP_MINIT_FUNCTION(mssql)
}
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));