[PHP4BETA] CVS update: php4/php4isapi

Date: Monday April 26, 1999 @ 10:00 Author: zeev Update of /repository/php4/php4isapi In directory php:/tmp/cvs-serv848/php4isapi Modified Files: php4isapi.c php4isapi.dsp Log Message: * Plenty of thread safety and Win32 work. * Changed PHP4 to compile as a DLL, both ISAPI and the the CGI run with the same DLL. * Switched to using the DLL runtime library under Win32. PHP will NOT work if compiled against the static library! * Removed yesterday's php4libts project (with php4dllts, it's obsolete). This *does* affect thread-unsafe Windows as well - the thread unsafe CGI is also dependant on the thread-unsafe DLL. Index: php4/php4isapi/php4isapi.c diff -u php4/php4isapi/php4isapi.c:1.1 php4/php4isapi/php4isapi.c:1.2 --- php4/php4isapi/php4isapi.c:1.1 Sun Apr 25 15:35:44 1999 +++ php4/php4isapi/php4isapi.c Mon Apr 26 10:00:50 1999 @@ -2,9 +2,11 @@ #include <httpext.h> #include <httpfilt.h> #include "php.h" +#include "main.h" #include "SAPI.h" #include "php_globals.h" + static int zend_isapi_ub_write(const char *str, uint str_length) { DWORD num_bytes = str_length; @@ -17,7 +19,7 @@ } -sapi_functions_struct sapi_functions = { +static sapi_functions_struct sapi_functions = { zend_isapi_ub_write }; @@ -31,9 +33,7 @@ SF_NOTIFY_NONSECURE_PORT | SF_NOTIFY_URL_MAP); - - php3_module_startup(); - + php_module_startup(&sapi_functions); return TRUE; } @@ -57,11 +57,11 @@ ELS_FETCH(); PLS_FETCH(); - php3_request_startup(CLS_C ELS_CC PLS_CC); + php_request_startup(CLS_C ELS_CC PLS_CC); primary_file.filename = UrlMap->pszPhysicalPath; primary_file.type = ZEND_HANDLE_FILENAME; - php3_parse(&primary_file CLS_CC ELS_CC PLS_CC); - php3_request_shutdown(NULL); + php_execute_script(&primary_file CLS_CC ELS_CC PLS_CC); + php_request_shutdown(NULL); return SF_STATUS_REQ_FINISHED_KEEP_CONN; } break; Index: php4/php4isapi/php4isapi.dsp diff -u php4/php4isapi/php4isapi.dsp:1.2 php4/php4isapi/php4isapi.dsp:1.3 --- php4/php4isapi/php4isapi.dsp:1.2 Sun Apr 25 23:03:37 1999 +++ php4/php4isapi/php4isapi.dsp Mon Apr 26 10:00:50 1999 @@ -42,7 +42,7 @@ # PROP Intermediate_Dir "Debug_TS" # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\win32" /I "..\..\libzend" /I ".." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "COMPILE_LIBZEND" /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\win32" /I "..\..\libzend" /I ".." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "COMPILE_LIBZEND" /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "_DEBUG" @@ -52,7 +52,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 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 /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4libts.lib libzendts.lib tsrm.lib lib44bsd95.lib resolv.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /pdbtype:sept /libpath:"..\Debug_TS" /libpath:"..\..\libzend\Debug_TS" /libpath:"..\..\TSRM\Debug_TS" /libpath:"..\lib" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /pdbtype:sept /libpath:"..\Debug_TS" !ELSEIF "$(CFG)" == "php4isapi - Win32 Release_TS" @@ -65,9 +65,10 @@ # PROP Use_Debug_Libraries 0 # PROP Output_Dir "Release_TS" # PROP Intermediate_Dir "Release_TS" +# PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\include" /I "..\win32" /I "..\..\libzend" /I ".." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "MSVC5" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /I "..\win32" /I "..\..\libzend" /I ".." /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZTS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" @@ -77,7 +78,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 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 /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4libts.lib libzendts.lib tsrm.lib lib44bsd95.lib resolv.lib /nologo /dll /machine:I386 /libpath:"..\Release_TS" /libpath:"..\..\libzend\Release_TS" /libpath:"..\..\TSRM\Release_TS" /libpath:"..\lib" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386 /libpath:"..\Release_TS" !ENDIF -- PHP 4 Beta