fmk Wed Jan 8 18:19:54 2003 EDT
Modified files:
/php4/ext/mssql php_mssql.c php_mssql.h
Log:
Changed global data type to avoid problems with initialization
Index: php4/ext/mssql/php_mssql.c
diff -u php4/ext/mssql/php_mssql.c:1.92 php4/ext/mssql/php_mssql.c:1.93
--- php4/ext/mssql/php_mssql.c:1.92 Tue Dec 31 11:07:01 2002
+++ php4/ext/mssql/php_mssql.c Wed Jan 8 18:19:53 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mssql.c,v 1.92 2002/12/31 16:07:01 sebastian Exp $ */
+/* $Id: php_mssql.c,v 1.93 2003/01/08 23:19:53 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -446,7 +446,7 @@
DBMSGHANDLE(mssql.login, (MHANDLEFUNC) php_mssql_message_handler);
#ifndef HAVE_FREETDS
- if (MS_SQL_G(secure_connection) == 1){
+ if (MS_SQL_G(secure_connection)){
DBSETLSECURE(mssql.login);
}
else {
Index: php4/ext/mssql/php_mssql.h
diff -u php4/ext/mssql/php_mssql.h:1.27 php4/ext/mssql/php_mssql.h:1.28
--- php4/ext/mssql/php_mssql.h:1.27 Tue Dec 31 11:07:02 2002
+++ php4/ext/mssql/php_mssql.h Wed Jan 8 18:19:54 2003
@@ -17,7 +17,7 @@
*/
-/* $Id: php_mssql.h,v 1.27 2002/12/31 16:07:02 sebastian Exp $ */
+/* $Id: php_mssql.h,v 1.28 2003/01/08 23:19:54 fmk Exp $ */
#ifndef PHP_MSSQL_H
#define PHP_MSSQL_H
@@ -149,17 +149,18 @@
long default_link;
long num_links,num_persistent;
long max_links,max_persistent;
- long allow_persistent;
+ zend_bool allow_persistent;
char *appname;
char *server_message;
long min_error_severity, min_message_severity;
long cfg_min_error_severity, cfg_min_message_severity;
- long compatability_mode, connect_timeout, timeout;
+ long connect_timeout, timeout;
+ zend_bool compatability_mode;
void (*get_column_content)(mssql_link *mssql_ptr,int offset,pval *result,int
column_type TSRMLS_DC);
long textsize, textlimit, batchsize;
- long datetimeconvert;
+ zend_bool datetimeconvert;
HashTable *resource_list, *resource_plist;
- long secure_connection;
+ zend_bool secure_connection;
long max_procs;
ZEND_END_MODULE_GLOBALS(mssql)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
