CVS update: php3/dl/mssql
| From: | shane | Date: | Mon, 07 Sep 1998 21:49:17 +0000 |
| Subject: | CVS update: php3/dl/mssql | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-867@lists.php.net to get a copy of this message | ||
Date: Monday September 7, 1998 @ 17:49
Author: shane
Update of /repository/php3/dl/mssql
In directory asf:/u2/tmp/cvs-serv19992
Modified Files:
mssql.c
Log Message:
small fix
Index: php3/dl/mssql/mssql.c
diff -c php3/dl/mssql/mssql.c:1.3 php3/dl/mssql/mssql.c:1.4
*** php3/dl/mssql/mssql.c:1.3 Mon Sep 7 12:47:24 1998
--- php3/dl/mssql/mssql.c Mon Sep 7 17:49:16 1998
***************
*** 244,276 ****
dberrhandle((DBERRHANDLE_PROC) php3_mssql_error_handler);
dbmsghandle((DBMSGHANDLE_PROC) php3_mssql_message_handler);
! if (cfg_get_string("mssql.interface_file",&interface_file)==SUCCESS) {
//dbsetifile(interface_file);
! }
! if
(cfg_get_long("mssql.allow_persistent",&msSQL_GLOBAL(allow_persistent))==FAILURE) {
msSQL_GLOBAL(allow_persistent)=1;
! }
! if (cfg_get_long("mssql.max_persistent",&msSQL_GLOBAL(max_persistent))==FAILURE) {
msSQL_GLOBAL(max_persistent)=-1;
! }
! if (cfg_get_long("mssql.max_links",&msSQL_GLOBAL(max_links))==FAILURE) {
msSQL_GLOBAL(max_links)=-1;
! }
! if
(cfg_get_long("mssql.min_error_severity",&msSQL_GLOBAL(cfg_min_error_severity))==FAILURE)
{
msSQL_GLOBAL(cfg_min_error_severity)=10;
! }
! if
(cfg_get_long("mssql.min_message_severity",&msSQL_GLOBAL(cfg_min_message_severity))==FAILURE)
{
msSQL_GLOBAL(cfg_min_message_severity)=10;
! }
! if (cfg_get_long("mssql.compatability_mode",&compatability_mode)==FAILURE) {
compatability_mode = 0;
! }
! if (cfg_get_long("mssql.connect_timeout",&connecttimeout)==FAILURE) {
connecttimeout = 5;
! }
! if
(cfg_get_long("magic_quotes_runtime",&msSQL_GLOBAL(magic_quotes_runtime))==FAILURE) {
msSQL_GLOBAL(magic_quotes_runtime) = 0;
! }
if (compatability_mode) {
msSQL_GLOBAL(get_column_content) = php3_mssql_get_column_content_with_type;
} else {
--- 244,276 ----
dberrhandle((DBERRHANDLE_PROC) php3_mssql_error_handler);
dbmsghandle((DBMSGHANDLE_PROC) php3_mssql_message_handler);
! // if (cfg_get_string("mssql.interface_file",&interface_file)==SUCCESS) {
//dbsetifile(interface_file);
! // }
! // if
(cfg_get_long("mssql.allow_persistent",&msSQL_GLOBAL(allow_persistent))==FAILURE) {
msSQL_GLOBAL(allow_persistent)=1;
! // }
! // if (cfg_get_long("mssql.max_persistent",&msSQL_GLOBAL(max_persistent))==FAILURE)
{
msSQL_GLOBAL(max_persistent)=-1;
! // }
! // if (cfg_get_long("mssql.max_links",&msSQL_GLOBAL(max_links))==FAILURE) {
msSQL_GLOBAL(max_links)=-1;
! // }
! // if
(cfg_get_long("mssql.min_error_severity",&msSQL_GLOBAL(cfg_min_error_severity))==FAILURE)
{
msSQL_GLOBAL(cfg_min_error_severity)=10;
! // }
! // if
(cfg_get_long("mssql.min_message_severity",&msSQL_GLOBAL(cfg_min_message_severity))==FAILURE)
{
msSQL_GLOBAL(cfg_min_message_severity)=10;
! // }
! // if (cfg_get_long("mssql.compatability_mode",&compatability_mode)==FAILURE) {
compatability_mode = 0;
! // }
! // if (cfg_get_long("mssql.connect_timeout",&connecttimeout)==FAILURE) {
connecttimeout = 5;
! // }
! // if
(cfg_get_long("magic_quotes_runtime",&msSQL_GLOBAL(magic_quotes_runtime))==FAILURE) {
msSQL_GLOBAL(magic_quotes_runtime) = 0;
! // }
if (compatability_mode) {
msSQL_GLOBAL(get_column_content) = php3_mssql_get_column_content_with_type;
} else {
***************
*** 391,396 ****
--- 391,398 ----
hashed_details = (char *) emalloc(hashed_details_length+1);
sprintf(hashed_details,"mssql_%s_%s_%s",SAFE_STRING(host), SAFE_STRING(user),
SAFE_STRING(passwd));
+ return_value->value.lval = 0;
+ return_value->type = IS_LONG;
/* set a DBLOGIN record */
if ((mssql.login=dblogin())==NULL) {
***************
*** 500,506 ****
}
}
return_value->value.lval = php3_list_insert(mssql_ptr,msSQL_GLOBAL(le_plink));
- return_value->type = IS_LONG;
} else { /* non persistent */
list_entry *index_ptr,new_index_ptr;
--- 502,507 ----
***************
*** 555,561 ****
mssql_ptr = (mssql_link *) emalloc(sizeof(mssql_link));
memcpy(mssql_ptr,&mssql,sizeof(mssql_link));
return_value->value.lval = php3_list_insert(mssql_ptr,msSQL_GLOBAL(le_link));
- return_value->type = IS_LONG;
/* add it to the hash */
new_index_ptr.ptr = (void *) return_value->value.lval;
--- 556,561 ----
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net