cvs: php4 /sapi/pi3web php4pi3web.dsp pi3web_sapi.c pi3web_sapi.h

holger Sat Apr 19 12:11:37 2003 EDT Modified files: /php4/sapi/pi3web php4pi3web.dsp pi3web_sapi.c pi3web_sapi.h Log: Added PHP4PI3WEB_EXPORTS in order to control exports/imports on Win32 Index: php4/sapi/pi3web/php4pi3web.dsp diff -u php4/sapi/pi3web/php4pi3web.dsp:1.2 php4/sapi/pi3web/php4pi3web.dsp:1.3 --- php4/sapi/pi3web/php4pi3web.dsp:1.2 Sat Apr 28 14:46:56 2001 +++ php4/sapi/pi3web/php4pi3web.dsp Sat Apr 19 12:11:36 2003 @@ -97,7 +97,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /I "..\ext\mysql\libmysql" /I "..\..\..\PiAPI" /I "..\..\..\Pi2API" /I "..\..\..\Pi3API" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D "NDEBUG" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "_WINDOWS" /D "_USRDLL" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D "NDEBUG" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "_WINDOWS" /D "_USRDLL" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D "PHP4PI3WEB_EXPORTS" /FR /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" Index: php4/sapi/pi3web/pi3web_sapi.c diff -u php4/sapi/pi3web/pi3web_sapi.c:1.50 php4/sapi/pi3web/pi3web_sapi.c:1.51 --- php4/sapi/pi3web/pi3web_sapi.c:1.50 Tue Feb 25 01:54:04 2003 +++ php4/sapi/pi3web/pi3web_sapi.c Sat Apr 19 12:11:36 2003 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pi3web_sapi.c,v 1.50 2003/02/25 06:54:04 sniper Exp $ */ +/* $Id: pi3web_sapi.c,v 1.51 2003/04/19 16:11:36 holger Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -40,9 +40,7 @@ #include "PiAPI.h" #include "Pi3API.h" -#define MAX_STATUS_LENGTH sizeof("xxxx LONGEST STATUS DESCRIPTION") #define PI3WEB_SERVER_VAR_BUF_SIZE 1024 -#define PI3WEB_POST_DATA_BUF 1024 int IWasLoaded=0; @@ -80,7 +78,7 @@ PUTS("<table border=0 cellpadding=3 cellspacing=1 width=600 align=center>\n"); PUTS("<tr><th colspan=2 bgcolor=\"" PHP_HEADER_COLOR "\">Pi3Web Server Information</th></tr>\n"); php_info_print_table_header(2, "Information Field", "Value"); - php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v 1.50 2003/02/25 06:54:04 sniper Exp $"); + php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v 1.51 2003/04/19 16:11:36 holger Exp $"); php_info_print_table_row(2, "Server Name Stamp", HTTPCore_getServerStamp()); snprintf(variable_buf, 511, "%d", HTTPCore_debugEnabled()); php_info_print_table_row(2, "Debug Enabled", variable_buf); @@ -233,7 +231,7 @@ DWORD read_from_input=0; DWORD total_read=0; - if (SG(read_post_bytes) < lpCB->cbAvailable) { + if ((DWORD)SG(read_post_bytes) < lpCB->cbAvailable) { read_from_buf = MIN(lpCB->cbAvailable-SG(read_post_bytes), count_bytes); memcpy(buffer, lpCB->lpbData+SG(read_post_bytes), read_from_buf); total_read += read_from_buf; @@ -385,7 +383,7 @@ STANDARD_SAPI_MODULE_PROPERTIES }; -DWORD PHP4_wrapper(LPCONTROL_BLOCK lpCB) +MODULE_API DWORD PHP4_wrapper(LPCONTROL_BLOCK lpCB) { zend_file_handle file_handle; int iRet = PIAPI_COMPLETED; @@ -454,7 +452,7 @@ return iRet; } -BOOL PHP4_startup() { +MODULE_API BOOL PHP4_startup() { tsrm_startup(1, 1, 0, NULL); sapi_startup(&pi3web_sapi_module); if (pi3web_sapi_module.startup) { @@ -464,7 +462,7 @@ return IWasLoaded; }; -BOOL PHP4_shutdown() { +MODULE_API BOOL PHP4_shutdown() { if (pi3web_sapi_module.shutdown) { pi3web_sapi_module.shutdown(&pi3web_sapi_module); }; Index: php4/sapi/pi3web/pi3web_sapi.h diff -u php4/sapi/pi3web/pi3web_sapi.h:1.4 php4/sapi/pi3web/pi3web_sapi.h:1.5 --- php4/sapi/pi3web/pi3web_sapi.h:1.4 Sat Feb 23 10:17:00 2002 +++ php4/sapi/pi3web/pi3web_sapi.h Sat Apr 19 12:11:36 2003 @@ -4,7 +4,7 @@ #ifdef PHP_WIN32 # include <windows.h> # include <httpext.h> -# ifdef SAPI_EXPORTS +# ifdef PHP4PI3WEB_EXPORTS # define MODULE_API __declspec(dllexport) # else # define MODULE_API __declspec(dllimport) @@ -79,9 +79,9 @@ } CONTROL_BLOCK, *LPCONTROL_BLOCK; -DWORD PHP4_wrapper(LPCONTROL_BLOCK lpCB); -BOOL PHP4_startup(); -BOOL PHP4_shutdown(); +MODULE_API DWORD PHP4_wrapper(LPCONTROL_BLOCK lpCB); +MODULE_API BOOL PHP4_startup(); +MODULE_API BOOL PHP4_shutdown(); // the following type declaration is for the server side typedef DWORD ( * PFN_WRAPPERFUNC )( CONTROL_BLOCK *pCB );