CVS update: php31/ext/mssql
| From: | shane | Date: | Wed, 16 Sep 1998 19:15:20 +0000 |
| Subject: | CVS update: php31/ext/mssql | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-1177@lists.php.net to get a copy of this message | ||
Date: Wednesday September 16, 1998 @ 15:15
Author: shane
Update of /repository/php31/ext/mssql
In directory asf:/u2/tmp/cvs-serv20230/ext/mssql
Modified Files:
mssql.c mssql.plg
Log Message:
fix cfg_get functions. I know they'll be changing eventualy, might as well
have it work now though.
apache works again.
Index: php31/ext/mssql/mssql.c
diff -c php31/ext/mssql/mssql.c:1.4 php31/ext/mssql/mssql.c:1.5
*** php31/ext/mssql/mssql.c:1.4 Thu Sep 10 20:22:37 1998
--- php31/ext/mssql/mssql.c Wed Sep 16 15:15:19 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 {
Index: php31/ext/mssql/mssql.plg
diff -c php31/ext/mssql/mssql.plg:1.4 php31/ext/mssql/mssql.plg:1.5
*** php31/ext/mssql/mssql.plg:1.4 Tue Sep 15 18:17:38 1998
--- php31/ext/mssql/mssql.plg Wed Sep 16 15:15:19 1998
***************
*** 11,29 ****
"Custom Build" with flags ""
"<Component 0xa>" with flags ""
! Creating temp file "C:\TEMP\RSP19A.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\RSP19A.tmp"
! Creating temp file "C:\TEMP\RSP19B.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\RSP19B.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
! php3_mssql.dll - 0 error(s), 1 warning(s)
--- 11,28 ----
"Custom Build" with flags ""
"<Component 0xa>" with flags ""
! Creating temp file "C:\TEMP\RSP4D.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\RSP4D.tmp"
! Creating temp file "C:\TEMP\RSP4E.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\RSP4E.tmp"
Compiling...
mssql.c
Linking...
Creating library c:\php31/php3_mssql.lib and object c:\php31/php3_mssql.exp
! php3_mssql.dll - 0 error(s), 0 warning(s)
--
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