CVS update: php31/ext/mssql

Date: Monday September 7, 1998 @ 17:50 Author: shane Update of /repository/php31/ext/mssql In directory asf:/u2/tmp/cvs-serv20004/ext/mssql Modified Files: mssql.c mssql.plg Log Message: ms sql module now works with persistent connections. small fix to dl loading on threaded compiles Index: php31/ext/mssql/mssql.c diff -c php31/ext/mssql/mssql.c:1.1 php31/ext/mssql/mssql.c:1.2 *** php31/ext/mssql/mssql.c:1.1 Mon Sep 7 01:33:19 1998 --- php31/ext/mssql/mssql.c Mon Sep 7 17:50:26 1998 *************** *** 34,43 **** #define IS_EXT_MODULE #ifdef THREAD_SAFE ! #include "tls.h" ! DWORD mssqltls; ! static int numthreads=0; ! void *mssql_mutex; #endif #if !(WIN32|WINNT) --- 34,47 ---- #define IS_EXT_MODULE #ifdef THREAD_SAFE ! # ifndef PHP_31 ! # undef THREAD_SAFE /*no need in 3.0*/ ! # else ! # include "tls.h" ! DWORD mssqltls; ! static int numthreads=0; ! void *mssql_mutex; ! # endif #endif #if !(WIN32|WINNT) *************** *** 168,179 **** if (result->data) { for (i=0; i<result->num_rows; i++) { for (j=0; j<result->num_fields; j++) { - #if PHP_31 php3_yystype_destructor(&result->data[i][j]); - #else - /*FIXME this shouldn't be working on 3.0 either */ - yystype_destructor(&result->data[i][j] _INLINE_TLS); - #endif } efree(result->data[i]); } --- 172,178 ---- *************** *** 245,279 **** dberrhandle((DBERRHANDLE_PROC) php3_mssql_error_handler); dbmsghandle((DBMSGHANDLE_PROC) php3_mssql_message_handler); ! /* FIXME ! 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)=0; ! } ! if (cfg_get_long("mssql.min_message_severity",&msSQL_GLOBAL(cfg_min_message_severity))==FAILURE) { ! msSQL_GLOBAL(cfg_min_message_severity)=0; ! } ! 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 { *************** *** 394,399 **** --- 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) { *************** *** 503,509 **** } } 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 ---- *************** *** 558,564 **** 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 ---- Index: php31/ext/mssql/mssql.plg diff -c php31/ext/mssql/mssql.plg:1.1 php31/ext/mssql/mssql.plg:1.2 *** php31/ext/mssql/mssql.plg:1.1 Mon Sep 7 01:33:19 1998 --- php31/ext/mssql/mssql.plg Mon Sep 7 17:50:27 1998 *************** *** 11,26 **** "Custom Build" with flags "" "<Component 0xa>" with flags "" ! Creating temp file "C:\TEMP\RSP2C.tmp" with contents </nologo /MTd /W3 /Gm /GX /Zi /Od /I "./" /I "../" /I "../../" /I "../../main" /D "PHP_31" /D "DBNTWIN32" /D "HAVE_MSSQL" /D "THREAD_SAFE" /D "COMPILE_DL" /D "DEBUG" /D "MSVC5" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"debug/mssql.pch" /YX /Fo"debug/" /Fd"debug/" /FD /c "D:\src\phpcvs\php31\ext\mssql\mssql.c" > ! Creating command line "cl.exe @C:\TEMP\RSP2C.tmp" ! Creating temp file "C:\TEMP\RSP2D.tmp" with contents <ntwdblib.lib phpsapi_core.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /incremental:yes /pdb:"c:\php31/php3_mssql.pdb" /debug /machine:I386 /out:"c:\php31/php3_mssql.dll" /implib:"c:\php31/php3_mssql.lib" /pdbtype:sept /libpath:"\src\lib" /libpath:"c:\php31" .\debug\mssql.obj> ! Creating command line "link.exe @C:\TEMP\RSP2D.tmp" Compiling... mssql.c ! D:\src\phpcvs\php31\ext\mssql\mssql.c(292) : warning C4101: 'interface_file' : unreferenced local variable Linking... Creating library c:\php31/php3_mssql.lib and object c:\php31/php3_mssql.exp --- 11,26 ---- "Custom Build" with flags "" "<Component 0xa>" with flags "" ! Creating temp file "C:\TEMP\RSP142.tmp" with contents </nologo /MTd /W3 /Gm /GX /Zi /Od /I "./" /I "../" /I "../../" /I "../../main" /D "PHP_31" /D "DBNTWIN32" /D "HAVE_MSSQL" /D "THREAD_SAFE" /D "COMPILE_DL" /D "DEBUG" /D "MSVC5" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"debug/mssql.pch" /YX /Fo"debug/" /Fd"debug/" /FD /c "D:\src\phpcvs\php31\ext\mssql\mssql.c" > ! Creating command line "cl.exe @C:\TEMP\RSP142.tmp" ! Creating temp file "C:\TEMP\RSP143.tmp" with contents <ntwdblib.lib phpsapi_core.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /incremental:yes /pdb:"c:\php31/php3_mssql.pdb" /debug /machine:I386 /out:"c:\php31/php3_mssql.dll" /implib:"c:\php31/php3_mssql.lib" /pdbtype:sept /libpath:"\src\lib" /libpath:"c:\php31" .\debug\mssql.obj> ! Creating command line "link.exe @C:\TEMP\RSP143.tmp" Compiling... mssql.c ! D:\src\phpcvs\php31\ext\mssql\mssql.c(289) : warning C4101: 'interface_file' : unreferenced local variable Linking... Creating library c:\php31/php3_mssql.lib and object c:\php31/php3_mssql.exp -- 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