cvs: /php4 INSTALL acconfig.h.in /php4/sapi/isapi config.m4 php4isapi.c

ssb Tue Sep 28 08:08:34 1999 EDT Modified files: /php4 INSTALL acconfig.h.in /php4/sapi/isapi config.m4 php4isapi.c Log: Started working on the Zeus support. Zeus's ISAPI obviously differs from Windows's, does someone have docs for the Windows API? Index: php4/INSTALL diff -u php4/INSTALL:1.8 php4/INSTALL:1.9 --- php4/INSTALL:1.8 Thu Sep 16 09:41:38 1999 +++ php4/INSTALL Tue Sep 28 08:08:33 1999 @@ -1,6 +1,8 @@ Installation Instructions for PHP 4.0 ------------------------------------- +Note! As of 4.0b3, PHP will require GNU make. + For the impatient here is a quick set of steps that will build PHP as an Apache module for Apache 1.3.x with MySQL support. A more verbose explanation follows. Index: php4/acconfig.h.in diff -u php4/acconfig.h.in:1.22 php4/acconfig.h.in:1.23 --- php4/acconfig.h.in:1.22 Fri Sep 24 20:32:25 1999 +++ php4/acconfig.h.in Tue Sep 28 08:08:33 1999 @@ -118,3 +118,7 @@ /* Define to compile PHP/Zend thread safe */ #undef ZTS + +/* Define when compiling with Zeus support */ +#undef WITH_ZEUS + Index: php4/sapi/isapi/config.m4 diff -u php4/sapi/isapi/config.m4:1.1 php4/sapi/isapi/config.m4:1.2 --- php4/sapi/isapi/config.m4:1.1 Mon Sep 27 12:34:28 1999 +++ php4/sapi/isapi/config.m4 Tue Sep 28 08:08:34 1999 @@ -1,11 +1,10 @@ -dnl ## $Id: config.m4,v 1.1 1999/09/27 16:34:28 ssb Exp $ -*- sh -*- +dnl ## $Id: config.m4,v 1.2 1999/09/28 12:08:34 ssb Exp $ -*- sh -*- AC_MSG_CHECKING(for Zeus ISAPI support) AC_ARG_WITH(zeus, [ --with-zeus=DIR Build PHP as an ISAPI module for use with Zeus.], [ if test "$withval" != "no"; then - SAPI_TARGET=libphp4_isapi.so AC_MSG_RESULT(yes) if test "${enable_thread_safety}" != "yes"; then AC_MSG_ERROR(You must specify --enable-thread-safety to build as an ISAPI module) @@ -16,6 +15,7 @@ if ! test -f "$zeuspath/web/include/httpext.h"; then AC_MSG_ERROR(Unable to find httpext.h in $zeuspath/web/include) fi + AC_DEFINE(WITH_ZEUS) AC_ADD_INCLUDE($zeuspath/web/include) PHP_SAPI=isapi SAPI_TARGET=php4isapi.so Index: php4/sapi/isapi/php4isapi.c diff -u php4/sapi/isapi/php4isapi.c:1.1 php4/sapi/isapi/php4isapi.c:1.2 --- php4/sapi/isapi/php4isapi.c:1.1 Mon Sep 27 12:34:28 1999 +++ php4/sapi/isapi/php4isapi.c Tue Sep 28 08:08:34 1999 @@ -1,4 +1,25 @@ -#include <windows.h> +/* + +----------------------------------------------------------------------+ + | PHP version 4.0 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997, 1998, 1999 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 2.0 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available at through the world-wide-web at | + | http://www.php.net/license/2_0.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Authors: | + | | + +----------------------------------------------------------------------+ + */ + +#if WIN32|WINNT +# include <windows.h> +#endif #include <httpext.h> #include <httpfilt.h> #include <httpext.h> @@ -8,6 +29,8 @@ #include "php_globals.h" #include "ext/standard/info.h" +#include "zeus.h" + #define MAX_STATUS_LENGTH sizeof("xxxx LONGEST STATUS DESCRIPTION") #define ISAPI_SERVER_VAR_BUF_SIZE 1024 #define ISAPI_POST_DATA_BUF 1024 @@ -190,7 +213,9 @@ 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; @@ -461,4 +486,11 @@ break; } return TRUE; -} \ No newline at end of file +} + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + */