cvs: /php4 README.Zeus /php4 INSTALL /php4/sapi/isapi php4isapi.c

joosters Wed Apr 12 02:48:56 2000 EDT Added files: /php4 README.Zeus Modified files: /php4 INSTALL /php4/sapi/isapi php4isapi.c Log: @- Zeus Webserver support (version 3.3.6+) for ISAPI Index: php4/INSTALL diff -u php4/INSTALL:1.12 php4/INSTALL:1.13 --- php4/INSTALL:1.12 Sun Mar 26 17:35:17 2000 +++ php4/INSTALL Wed Apr 12 02:48:26 2000 @@ -11,6 +11,8 @@ If you want both PHP 3 and 4 modules in the same Apache server, check the bottom of this file for instructions. +INSTALLATION WITH THE ZEUS WEB SERVER: +--Please see the 'README.Zeus' file included in this distribution QUICK INSTALL (DSO) Index: php4/sapi/isapi/php4isapi.c diff -u php4/sapi/isapi/php4isapi.c:1.36 php4/sapi/isapi/php4isapi.c:1.37 --- php4/sapi/isapi/php4isapi.c:1.36 Fri Apr 7 09:50:54 2000 +++ php4/sapi/isapi/php4isapi.c Wed Apr 12 02:48:26 2000 @@ -20,9 +20,12 @@ #ifdef PHP_WIN32 # include <windows.h> # include <process.h> +# define SEPARATOR '\\' #else # define __try # define __except(val) +# define __declspec(foo) +# define SEPARATOR '/' #endif #include <httpext.h> @@ -37,7 +40,9 @@ #include "php_ini.h" #ifdef WITH_ZEUS -#include "zeus.h" +# include "httpext.h" +# include <errno.h> +# define GetLastError() errno #endif #define MAX_STATUS_LENGTH sizeof("xxxx LONGEST STATUS DESCRIPTION") @@ -219,9 +224,7 @@ header_info.pszStatus = status_buf; break; } -#ifndef WITH_ZEUS header_info.cchStatus = strlen(header_info.pszStatus); -#endif header_info.pszHeader = combined_headers; header_info.cchHeader = total_length; lpECB->dwHttpStatusCode = SG(sapi_headers).http_response_code; @@ -450,12 +453,12 @@ SG(request_info).content_type = lpECB->lpszContentType; SG(request_info).content_length = lpECB->cbTotalBytes; { - char *path_end = strrchr(SG(request_info).path_translated, '\\'); + char *path_end = strrchr(SG(request_info).path_translated, SEPARATOR); if (path_end) { *path_end = 0; PHP_CHDIR(SG(request_info).path_translated); - *path_end = '\\'; + *path_end = SEPARATOR; } } if (!bFilterLoaded) { /* we don't have valid ISAPI Filter information */ @@ -471,9 +474,7 @@ LPEXTENSION_CONTROL_BLOCK lpECB = (LPEXTENSION_CONTROL_BLOCK) SG(server_context); header_info.pszStatus = "500 Internal Server Error"; -#ifndef WITH_ZEUS header_info.cchStatus = strlen(header_info.pszStatus); -#endif header_info.pszHeader = "Content-Type: text/html\r\n\r\n"; header_info.cchHeader = strlen(header_info.pszHeader); @@ -488,7 +489,11 @@ BOOL WINAPI GetExtensionVersion(HSE_VERSION_INFO *pVer) { pVer->dwExtensionVersion = HSE_VERSION; +#ifdef WITH_ZEUS + strncpy( pVer->lpszExtensionDesc, sapi_module.name, HSE_MAX_EXT_DLL_NAME_LEN); +#else lstrcpyn(pVer->lpszExtensionDesc, sapi_module.name, HSE_MAX_EXT_DLL_NAME_LEN); +#endif return TRUE; }