This commit was manufactured by cvs2svn to create branch 'PHP_5'.PHP-5

5 files changed, 0 insertions, 857 deletions

diff --git a/sapi/nsapi/CREDITS b/sapi/nsapi/CREDITS
deleted file mode 100644
index c41a7bf583..0000000000
--- a/sapi/nsapi/CREDITS
+++ /dev/null
@@ -1,2 +0,0 @@
-NSAPI
-Jayakumar Muthukumarasamy
diff --git a/sapi/nsapi/config.m4 b/sapi/nsapi/config.m4
deleted file mode 100644
index 6a556dbe6f..0000000000
--- a/sapi/nsapi/config.m4
+++ /dev/null
@@ -1,45 +0,0 @@
-dnl
-dnl $Id$
-dnl
-
-AC_MSG_CHECKING(for NSAPI support)
-AC_ARG_WITH(nsapi,
-[  --with-nsapi=DIR        Build PHP as NSAPI module for use with iPlanet.],[
-  PHP_NSAPI=$withval
-],[
-  PHP_NSAPI=no
-])
-AC_MSG_RESULT($PHP_NSAPI)
-
-if test "$PHP_NSAPI" != "no"; then
-  if test ! -d $PHP_NSAPI/bin ; then
-    AC_MSG_ERROR(Please specify the path to the root of your Netscape server using --with-nsapi=DIR)
-  fi
-  AC_MSG_CHECKING(for NSAPI include files)
-  if test -d $PHP_NSAPI/include ; then
-    NSAPI_INCLUDE=$PHP_NSAPI/include
-    AC_MSG_RESULT(Netscape-Enterprise/3.x style)
-    AC_CHECK_HEADERS([$NSAPI_INCLUDE/nsapi.h])
-  fi
-  if test -d $PHP_NSAPI/plugins/include ; then
-    test -n "$NSAPI_INCLUDE" && NSAPI_INC_DIR="-I$NSAPI_INCLUDE"
-    NSAPI_INCLUDE="$PHP_NSAPI/plugins/include"
-    AC_MSG_RESULT(iPlanet/4.x style)
-    AC_CHECK_HEADERS([$NSAPI_INCLUDE/nsapi.h])
-    NSAPI_INCLUDE="$NSAPI_INC_DIR -I$NSAPI_INCLUDE"
-  fi
-  if test "$NSAPI_INCLUDE" = ""; then
-    AC_MSG_ERROR(Please check you have nsapi.h in either $PHP_NSAPI/include or $PHP_NSAPI/plugins/include)
-  fi
-
-  PHP_EVAL_INCLINE($NSAPI_INCLUDE)
-  PHP_BUILD_THREAD_SAFE
-  AC_DEFINE(HAVE_NSAPI,1,[Whether you have a Netscape Server])
-  PHP_SELECT_SAPI(nsapi, shared, nsapi.c)
-  INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_NSAPI/bin/"
-fi
-
-
-dnl ## Local Variables:
-dnl ## tab-width: 4
-dnl ## End:
diff --git a/sapi/nsapi/nsapi-readme.txt b/sapi/nsapi/nsapi-readme.txt
deleted file mode 100644
index 61e7dc8254..0000000000
--- a/sapi/nsapi/nsapi-readme.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-Configuration of your Netscape or iPlanet Web Server for PHP4
--------------------------------------------------------------
-
-These instructions are targetted at Netscape Enterprise Web Server and
-SUN/Netscape Alliance iPlanet Web Server. On other web servers your
-milage may vary.
-
-Firstly you may need to add some paths to the LD_LIBRARY_PATH
-environment for Netscape to find all the shared libs. This is best done
-in the start script for your Netscape server.  Windows users can
-probably skip this step. The start script is located in:
-
-    <path-to-netscape-server>/https-servername/start
-
-
-Netscape config files are located in:
-
-    <path-to-netscape-server>/https-servername/config
-
-
-Add the following line to mime.types:
-
-    type=magnus-internal/x-httpd-php	exts=php
-
-
-Add the following to obj.conf, shlib will vary depending on your OS, for
-Unix it will be something like:
-
-    "<path-to-netscape-server>/bin/libphp4.so".
-
-
-Note! Place following two lines after mime.types init:
-
-    Init fn="load-modules" funcs="php4_init,php4_close,php4_execute,php4_auth_trans" shlib="/php4/nsapiPHP4.dll"
-    Init fn=php4_init errorString="Failed to initialize PHP!"
-
-    <Object name="default">
-    .
-    .
-    .
-    # NOTE this next line should happen after all 'ObjectType' and before
-    # all 'AddLog' lines
-
-    Service fn="php4_execute" type="magnus-internal/x-httpd-php"
-    .
-    .
-    </Object>
-
-    <Object name="x-httpd-php">
-    ObjectType fn="force-type" type="magnus-internal/x-httpd-php"
-    Service fn=php4_execute
-    </Object>
-
-
-Authentication configuration
-----------------------------
-
-PHP authentication cannot be used with any other authentication.  ALL
-AUTHENTICATION IS PASSED TO YOUR PHP SCRIPT.  To configure PHP
-Authentication for the entire server, add the following line:
-
-    <Object name="default">
-    AuthTrans fn=php4_auth_trans
-    .
-    .
-    .
-    .
-    </Object>
-
-
-To use PHP Authentication on a single directory, add the following:
-
-    <Object ppath="d:\path\to\authenticated\dir\*">
-    AuthTrans fn=php4_auth_trans
-    </Object>
-
diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c
deleted file mode 100644
index 155d812aec..0000000000
--- a/sapi/nsapi/nsapi.c
+++ /dev/null
@@ -1,599 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP Version 4                                                        |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2003 The PHP Group                                |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 2.02 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_02.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.               |
-   +----------------------------------------------------------------------+
-   | Author: Jayakumar Muthukumarasamy <jk@kasenna.com>                   |
-   |         Uwe Schindler <uwe@thetaphi.de>                              |
-   +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */
-
-/*
- * PHP includes
- */
-#define NSAPI 1
-
-#include "php.h"
-#include "php_variables.h"
-#include "ext/standard/info.h"
-#include "php_ini.h"
-#include "php_globals.h"
-#include "SAPI.h"
-#include "php_main.h"
-#include "php_version.h"
-#include "TSRM.h"
-#include "ext/standard/php_standard.h"
-
-/*
- * If neither XP_UNIX not XP_WIN32 is defined, try to guess which one.
- * Ideally, this should be done by the configure script.
- */
-#if !defined(XP_UNIX) && !defined(XP_WIN32)
-#if defined(WIN32)
-#define XP_WIN32
-#else
-#define XP_UNIX
-#endif
-#endif
-
-/*
- * NSAPI includes
- */
-#include "nsapi.h"
-#include "base/pblock.h"
-#include "base/session.h"
-#include "frame/req.h"
-#include "frame/protocol.h"  /* protocol_start_response */
-#include "base/util.h"       /* is_mozilla, getline */
-#include "frame/log.h"       /* log_error */
-
-/*
- * Timeout for net_read(). This should probably go into php.ini
- */
-#define NSAPI_READ_TIMEOUT	60	/* 60 seconds */
-
-#define NSLS_D		struct nsapi_request_context *request_context
-#define NSLS_DC		, NSLS_D
-#define NSLS_C		request_context
-#define NSLS_CC		, NSLS_C
-#define NSG(v)		(request_context->v)
-
-#define NS_BUF_SIZE 2048
-
-/*
- * ZTS needs to be defined for NSAPI to work
- */
-#if !defined(ZTS)
-#error "NSAPI module needs ZTS to be defined"
-#endif
-
-/*
- * Structure to encapsulate the NSAPI request in SAPI
- */
-typedef struct nsapi_request_context {
-	pblock	*pb;
-	Session	*sn;
-	Request	*rq;
-	int	read_post_bytes;
-} nsapi_request_context;
-
-/*
- * Mappings between NSAPI names and environment variables. This
- * mapping was obtained from the sample programs at the iplanet
- * website.
- */
-typedef struct nsapi_equiv {
-	const char *env_var;
-	const char *nsapi_eq;
-} nsapi_equiv;
-
-static nsapi_equiv nsapi_headers[] = {
-	{ "CONTENT_LENGTH",			"content-length" },
-	{ "CONTENT_TYPE",			"content-type" }
-};
-static size_t nsapi_headers_size = sizeof(nsapi_headers)/sizeof(nsapi_headers[0]);
-
-static nsapi_equiv nsapi_reqpb[] = {
-	{ "QUERY_STRING",		"query" },
-	{ "REQUEST_LINE",		"clf-request" },
-	{ "REQUEST_METHOD",		"method" },
-	{ "PHP_SELF",			"uri" },
-	{ "SERVER_PROTOCOL",	"protocol" }
-};
-static size_t nsapi_reqpb_size = sizeof(nsapi_reqpb)/sizeof(nsapi_reqpb[0]);
-
-static nsapi_equiv nsapi_vars[] = {
-	{ "PATH_INFO",			"path-info" },
-	{ "SCRIPT_FILENAME",	"path" },
-	{ "AUTH_TYPE",			"auth-type" },
-	{ "CLIENT_CERT",		"auth-cert" },
-	{ "REMOTE_USER",		"auth-user" }
-};
-static size_t nsapi_vars_size = sizeof(nsapi_vars)/sizeof(nsapi_vars[0]);
-
-static nsapi_equiv nsapi_client[] = {
-	{ "HTTPS_KEYSIZE",		"keysize" },
-	{ "HTTPS_SECRETSIZE",	"secret-keysize" },
-	{ "REMOTE_ADDR",		"ip" },
-	{ "REMOTE_HOST",		"ip" }
-};
-static size_t nsapi_client_size = sizeof(nsapi_client)/sizeof(nsapi_client[0]);
-
-static char *nsapi_strdup(char *str)
-{
-	if (str != NULL) {
-		return STRDUP(str);
-	}
-	return NULL;
-}
-
-static void nsapi_free(void *addr)
-{
-	if (addr != NULL) {
-		FREE(addr);
-	}
-}
-
-static int sapi_nsapi_ub_write(const char *str, unsigned int str_length TSRMLS_DC)
-{
-	int retval;
-	nsapi_request_context *rc;
-
-	rc = (nsapi_request_context *)SG(server_context);
-	retval = net_write(rc->sn->csd, (char *)str, str_length);
-	if (retval == IO_ERROR /* -1 */ || retval == IO_EOF /* 0 */) {
-		php_handle_aborted_connection();
-	}
-	return retval;
-}
-
-static int sapi_nsapi_header_handler(sapi_header_struct *sapi_header, sapi_headers_struct *sapi_headers TSRMLS_DC)
-{
-	char *header_name, *header_content, *p;
-	nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
-
-	header_name = sapi_header->header;
-	header_content = p = strchr(header_name, ':');
-	if (p == NULL) {
-		efree(sapi_header->header);
-		return 0;
-	}
-
-	*p = 0;
-	do {
-		header_content++;
-	} while (*header_content == ' ');
-
-	if (!strcasecmp(header_name, "Content-Type")) {
-		param_free(pblock_remove("content-type", rc->rq->srvhdrs));
-		pblock_nvinsert("content-type", header_content, rc->rq->srvhdrs);
-	} else if (!strcasecmp(header_name, "Set-Cookie")) {
-		pblock_nvinsert("set-cookie", header_content, rc->rq->srvhdrs);
-	} else {
-		pblock_nvinsert(header_name, header_content, rc->rq->srvhdrs);
-	}
-
-	*p = ':';	/* restore '*p' */
-
-	efree(sapi_header->header);
-
-	return 0;	/* don't use the default SAPI mechanism, NSAPI duplicates this functionality */
-}
-
-static int sapi_nsapi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
-{
-	int retval;
-	nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
-
-	/*
-	 * We could probably just do this in the header_handler. But, I
-	 * don't know what the implication of doing it there is.
-	 */
-	if (SG(sapi_headers).send_default_content_type) {
-		param_free(pblock_remove("content-type", rc->rq->srvhdrs));
-		pblock_nvinsert("content-type", "text/html", rc->rq->srvhdrs);
-	}
-
-	protocol_status(rc->sn, rc->rq, SG(sapi_headers).http_response_code, NULL);
-	retval = protocol_start_response(rc->sn, rc->rq);
-
-	if (retval == REQ_PROCEED || retval == REQ_NOACTION) {
-		return SAPI_HEADER_SENT_SUCCESSFULLY;
-	} else {
-		return SAPI_HEADER_SEND_FAILED;
-	}
-}
-
-static int sapi_nsapi_read_post(char *buffer, uint count_bytes TSRMLS_DC)
-{
-	nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
-	char *read_ptr = buffer, *content_length_str = NULL;
-	uint bytes_read = 0;
-	int length, content_length = 0;
-	netbuf *nbuf = rc->sn->inbuf;
-
-	/*
-	 *	Yesss!
-	 */
-	count_bytes = MIN(count_bytes, SG(request_info).content_length-rc->read_post_bytes);
-	content_length = SG(request_info).content_length;
-
-#if 0
-	/*
-	 * Determine the content-length. This will tell us the limit we can read.
-	 */
-	content_length_str = pblock_findval("content-length", rc->rq->headers);
-	if (content_length_str != NULL) {
-		content_length = strtol(content_length_str, 0, 0);
-	}
-#endif
-
-	if (content_length <= 0) {
-		return 0;
-	}
-
-	/*
-	 * Gobble any pending data in the netbuf.
-	 */
-	length = nbuf->cursize - nbuf->pos;
-	length = MIN(count_bytes, length);
-	if (length > 0) {
-		memcpy(read_ptr, nbuf->inbuf + nbuf->pos, length);
-		bytes_read += length;
-		read_ptr += length;
-		content_length -= length;
-		nbuf->pos += length;
-	}
-
-	/*
-	 * Read the remaining from the socket.
-	 */
-	while (content_length > 0 && bytes_read < count_bytes) {
-		int bytes_to_read = count_bytes - bytes_read;
-
-		if (content_length < bytes_to_read) {
-			bytes_to_read = content_length;
-		}
-
-		length = net_read(rc->sn->csd, read_ptr, bytes_to_read, NSAPI_READ_TIMEOUT);
-
-		if (length == IO_ERROR || length == IO_EOF) {
-			break;
-		}
-
-		bytes_read += length;
-		read_ptr += length;
-		content_length -= length;
-	}
-
-	if ( bytes_read > 0 ) {
-		rc->read_post_bytes += bytes_read;
-	}
-	return bytes_read;
-}
-
-static char *sapi_nsapi_read_cookies(TSRMLS_D)
-{
-	char *cookie_string;
-	nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
-
-	cookie_string = pblock_findval("cookie", rc->rq->headers);
-	return cookie_string;
-}
-
-static void sapi_nsapi_register_server_variables(zval *track_vars_array TSRMLS_DC)
-{
-	nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
-	register size_t i;
-	char *value,*p;
-	char buf[NS_BUF_SIZE + 1];
-	struct pb_entry *entry;
-
-	for (i = 0; i < nsapi_reqpb_size; i++) {
-		value = pblock_findval(nsapi_reqpb[i].nsapi_eq, rc->rq->reqpb);
-		if (value) {
-			php_register_variable((char *)nsapi_reqpb[i].env_var, value, track_vars_array TSRMLS_CC);
-		}
-	}
-
-	for (i = 0; i < nsapi_headers_size; i++) {
-		value = pblock_findval(nsapi_headers[i].nsapi_eq, rc->rq->headers);
-		if (value) {
-			php_register_variable((char *)nsapi_headers[i].env_var, value, track_vars_array TSRMLS_CC);
-		}
-	}
-
-	for (i=0; i < rc->rq->headers->hsize; i++) {
-		entry=rc->rq->headers->ht[i];
-		while (entry) {
-			snprintf(buf, NS_BUF_SIZE, "HTTP_%s", entry->param->name);
-			for(p = buf + 5; *p; p++) {
-				*p = toupper(*p);
-				if (*p < 'A' || *p > 'Z') {
-					*p = '_';
-				}
-			}
-			php_register_variable(buf, entry->param->value, track_vars_array TSRMLS_CC);
-			entry=entry->next;
-		}
-  	}
-
-	for (i = 0; i < nsapi_vars_size; i++) {
-		value = pblock_findval(nsapi_vars[i].nsapi_eq, rc->rq->vars);
-		if (value) {
-			php_register_variable((char *)nsapi_vars[i].env_var, value, track_vars_array TSRMLS_CC);
-		}
-	}
-
-	for (i = 0; i < nsapi_client_size; i++) {
-		value = pblock_findval(nsapi_client[i].nsapi_eq, rc->sn->client);
-		if (value) {
-			php_register_variable((char *)nsapi_client[i].env_var, value, track_vars_array TSRMLS_CC);
-		}
-	}
-
-	if (value = session_dns(rc->sn)) {
-		php_register_variable("REMOTE_HOST", value, track_vars_array TSRMLS_CC);
-		nsapi_free(value);
-	}
-
-	sprintf(buf, "%d", conf_getglobals()->Vport);
-	php_register_variable("SERVER_PORT", buf, track_vars_array TSRMLS_CC);
-	php_register_variable("SERVER_NAME", conf_getglobals()->Vserver_hostname, track_vars_array TSRMLS_CC);
-
-	value = http_uri2url_dynamic("", "", rc->sn, rc->rq);
-	php_register_variable("SERVER_URL", value, track_vars_array TSRMLS_CC);
-	nsapi_free(value);
-
-	php_register_variable("SERVER_SOFTWARE", system_version(), track_vars_array TSRMLS_CC);
-	php_register_variable("HTTPS", (security_active ? "ON" : "OFF"), track_vars_array TSRMLS_CC);
-	php_register_variable("GATEWAY_INTERFACE", "CGI/1.1", track_vars_array TSRMLS_CC);
-
-	/* DOCUMENT_ROOT */
-	if (value = request_translate_uri("/", rc->sn)) {
-	  	value[strlen(value) - 1] = 0;
-		php_register_variable("DOCUMENT_ROOT", value, track_vars_array TSRMLS_CC);
-		nsapi_free(value);
-	}
-
-	/* PATH_TRANSLATED */
-	if (value = pblock_findval("path-info", rc->rq->vars)) {
-		if (value = request_translate_uri(value, rc->sn)) {
-			php_register_variable("PATH_TRANSLATED", value, track_vars_array TSRMLS_CC);
-			nsapi_free(value);
-		}
-	}
-
-	/* Create full Request-URI */
-	if (value = pblock_findval("uri", rc->rq->reqpb)) {
-		snprintf(buf,NS_BUF_SIZE, "%s", value);
-		if (value = pblock_findval("query", rc->rq->reqpb)) {
-		  	p = strchr(buf, 0);
-			snprintf(p, NS_BUF_SIZE-(p-buf), "?%s", value);
-		}
-		php_register_variable("REQUEST_URI", buf, track_vars_array TSRMLS_CC);
-  	}
-
-	/* Create Script-Name */
-	if (value = pblock_findval("uri", rc->rq->reqpb)) {
-		snprintf(buf,NS_BUF_SIZE, "%s", value);
-		if (value = pblock_findval("path-info", rc->rq->vars)) {
-			buf[strlen(buf) - strlen(value)] = 0;
-		}
-		php_register_variable("SCRIPT_NAME", buf, track_vars_array TSRMLS_CC);
-	}
-}
-
-static void nsapi_log_message(char *message)
-{
-	TSRMLS_FETCH();
-	nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
-
-	log_error(LOG_INFORM, "PHP module", rc->sn, rc->rq, "%s", message);
-}
-
-static int php_nsapi_startup(sapi_module_struct *sapi_module)
-{
-	if (php_module_startup(sapi_module, NULL, 0)==FAILURE) {
-		return FAILURE;
-	}
-	return SUCCESS;
-}
-
-
-static sapi_module_struct nsapi_sapi_module = {
-	"nsapi",                                /* name */
-	"NSAPI",                                /* pretty name */
-
-	php_nsapi_startup,                      /* startup */
-	php_module_shutdown_wrapper,            /* shutdown */
-
-	NULL,                                   /* activate */
-	NULL,                                   /* deactivate */
-
-	sapi_nsapi_ub_write,                    /* unbuffered write */
-	NULL,                                   /* flush */
-	NULL,                                   /* get uid */
-	NULL,                                   /* getenv */
-
-	php_error,                              /* error handler */
-
-	sapi_nsapi_header_handler,              /* header handler */
-	sapi_nsapi_send_headers,                /* send headers handler */
-	NULL,                                   /* send header handler */
-
-	sapi_nsapi_read_post,                   /* read POST data */
-	sapi_nsapi_read_cookies,                /* read Cookies */
-
-	sapi_nsapi_register_server_variables,   /* register server variables */
-	nsapi_log_message,                      /* Log message */
-
-	NULL,                                   /* Block interruptions */
-	NULL,                                   /* Unblock interruptions */
-
-	STANDARD_SAPI_MODULE_PROPERTIES
-};
-
-
-static void nsapi_request_ctor(NSLS_D TSRMLS_DC)
-{
-	char *query_string    = pblock_findval("query", NSG(rq)->reqpb);
-	char *uri             = pblock_findval("uri", NSG(rq)->reqpb);
-	char *path_info       = pblock_findval("path-info", NSG(rq)->vars);
-	char *request_method  = pblock_findval("method", NSG(rq)->reqpb);
-	char *content_type    = pblock_findval("content-type", NSG(rq)->headers);
-	char *content_length  = pblock_findval("content-length", NSG(rq)->headers);
-	char *path_translated = pblock_findval("path", NSG(rq)->vars);;
-
-#if defined(NSAPI_DEBUG)
-	log_error(LOG_INFORM, "nsapi_request_ctor", NSG(sn), NSG(rq),
-		"query_string = %s, "
-		"uri = %s, "
-		"path_info = %s, "
-		"path_translated = %s, "
-		"request_method = %s, "
-		"content_type = %s, "
-		"content_length = %s",
-		query_string,
-		uri,
-		path_info,
-		path_translated,
-		request_method,
-		content_type,
-		content_length);
-#endif
-
-	SG(request_info).query_string = nsapi_strdup(query_string);
-	SG(request_info).request_uri = nsapi_strdup(uri);
-	SG(request_info).request_method = nsapi_strdup(request_method);
-	SG(request_info).path_translated = nsapi_strdup(path_translated);
-	SG(request_info).content_type = nsapi_strdup(content_type);
-	SG(request_info).content_length = (content_length == NULL) ? 0 : strtoul(content_length, 0, 0);
-	SG(sapi_headers).http_response_code = 200;
-}
-
-static void nsapi_request_dtor(NSLS_D TSRMLS_DC)
-{
-	nsapi_free(SG(request_info).query_string);
-	nsapi_free(SG(request_info).request_uri);
-	nsapi_free(SG(request_info).request_method);
-	nsapi_free(SG(request_info).path_translated);
-	nsapi_free(SG(request_info).content_type);
-}
-
-int nsapi_module_main(NSLS_D TSRMLS_DC)
-{
-	zend_file_handle file_handle;
-
-	if (php_request_startup(TSRMLS_C) == FAILURE) {
-		return FAILURE;
-	}
-
-	file_handle.type = ZEND_HANDLE_FILENAME;
-	file_handle.filename = SG(request_info).path_translated;
-	file_handle.free_filename = 0;
-	file_handle.opened_path = NULL;
-
-#if defined(NSAPI_DEBUG)
-	log_error(LOG_INFORM, "nsapi_module_main", NSG(sn), NSG(rq), "Parsing [%s]", SG(request_info).path_translated);
-#endif
-
-	php_execute_script(&file_handle TSRMLS_CC);
-	php_request_shutdown(NULL);
-
-#if defined(NSAPI_DEBUG)
-	log_error(LOG_INFORM, "nsapi_module_main", NSG(sn), NSG(rq), "PHP request finished Ok");
-#endif
-
-	return SUCCESS;
-}
-
-void NSAPI_PUBLIC php4_close(void *vparam)
-{
-	if (nsapi_sapi_module.shutdown) {
-		nsapi_sapi_module.shutdown(&nsapi_sapi_module);
-	}
-	tsrm_shutdown();
-}
-
-int NSAPI_PUBLIC php4_init(pblock *pb, Session *sn, Request *rq)
-{
-	php_core_globals *core_globals;
-
-	tsrm_startup(1, 1, 0, NULL);
-	core_globals = ts_resource(core_globals_id);
-
-	sapi_startup(&nsapi_sapi_module);
-	nsapi_sapi_module.startup(&nsapi_sapi_module);
-
-	log_error(LOG_INFORM, "php4_init", sn, rq, "Initialized PHP Module\n");
-	return REQ_PROCEED;
-}
-
-int NSAPI_PUBLIC php4_execute(pblock *pb, Session *sn, Request *rq)
-{
-	int retval;
-	nsapi_request_context *request_context;
-	TSRMLS_FETCH();
-
-	request_context = (nsapi_request_context *)MALLOC(sizeof(nsapi_request_context));
-	request_context->pb = pb;
-	request_context->sn = sn;
-	request_context->rq = rq;
-	request_context->read_post_bytes = 0;
-
-	SG(server_context) = request_context;
-
-	nsapi_request_ctor(NSLS_C TSRMLS_CC);
-	retval = nsapi_module_main(NSLS_C TSRMLS_CC);
-	nsapi_request_dtor(NSLS_C TSRMLS_CC);
-
-	FREE(request_context);
-
-	return (retval == SUCCESS) ? REQ_PROCEED : REQ_EXIT;
-}
-
-/*********************************************************
-/ authentication
-/
-/ we have to make a 'fake' authenticator for netscape so it
-/ will pass authentication through to php, and allow us to
-/ check authentication with our scripts.
-/
-/ php4_auth_trans
-/   main function called from netscape server to authenticate
-/   a line in obj.conf:
-/		funcs=php4_auth_trans shlib="path/to/this/phpnsapi.dll"
-/	and:
-/		<Object ppath="path/to/be/authenticated/by/php/*">
-/		AuthTrans fn="php4_auth_trans"
-/*********************************************************/
-int NSAPI_PUBLIC php4_auth_trans(pblock * pb, Session * sn, Request * rq)
-{
-	/* This is a DO NOTHING function that allows authentication 
-	 * information
-	 * to be passed through to PHP scripts.
-	 */
-	return REQ_PROCEED;
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
-       
\ No newline at end of file
diff --git a/sapi/nsapi/php4nsapi.dsp b/sapi/nsapi/php4nsapi.dsp
deleted file mode 100644
index 9b0b8c9a56..0000000000
--- a/sapi/nsapi/php4nsapi.dsp
+++ /dev/null
@@ -1,135 +0,0 @@
-# Microsoft Developer Studio Project File - Name="php4nsapi" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-

-CFG=php4nsapi - Win32 Debug_TS

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "php4nsapi.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "php4nsapi.mak" CFG="php4nsapi - Win32 Debug_TS"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "php4nsapi - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "php4nsapi - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "php4nsapi - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "php4nsapi - Win32 Release_TS"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "php4nsapi___Win32_Release_TS"

-# PROP BASE Intermediate_Dir "php4nsapi___Win32_Release_TS"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# 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 "php4nsapi_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\..\..\php_build\nsapi30\include\\" /I "..\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\main" /I "..\..\tsrm" /D ZEND_DEBUG=0 /D "NDEBUG" /D "XP_WIN32" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "php4nsapi_EXPORTS" /D "WIN32" /D "_MBCS" /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"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 ns-httpd30.lib php4ts.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 /base:"0x62000000" /version:4.0 /dll /machine:I386 /libpath:"..\..\..\php_build\nsapi30\lib\\" /libpath:"..\..\Release_TS" /libpath:"..\..\TSRM\Release_TS" /libpath:"..\..\Zend\Release_TS"

-

-!ELSEIF  "$(CFG)" == "php4nsapi - Win32 Release_TS_inline"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "php4nsapi___Win32_Release_TS_inline"

-# PROP BASE Intermediate_Dir "php4nsapi___Win32_Release_TS_inline"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\..\Release_TS_inline"

-# PROP Intermediate_Dir "Release_TS_inline"

-# 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 "php4nsapi_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "..\..\..\php_build\nsapi30\include\\" /I "..\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\main" /I "..\..\tsrm" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "NDEBUG" /D "XP_WIN32" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "php4nsapi_EXPORTS" /D "WIN32" /D "_MBCS" /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"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 ns-httpd30.lib php4ts.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 /base:"0x62000000" /version:4.0 /dll /machine:I386 /libpath:"..\..\..\php_build\nsapi30\lib\\" /libpath:"..\..\Release_TS_inline" /libpath:"..\..\TSRM\Release_TS_inline" /libpath:"..\..\Zend\Release_TS_inline"

-

-!ELSEIF  "$(CFG)" == "php4nsapi - Win32 Debug_TS"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "php4nsapi___Win32_Debug_TS"

-# PROP BASE Intermediate_Dir "php4nsapi___Win32_Debug_TS"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\..\Debug_TS"

-# PROP Intermediate_Dir "Debug_TS"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "php4nsapi_EXPORTS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "..\..\..\php_build\nsapi30\include\\" /I "..\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\..\bindlib_w32" /I "..\..\main" /I "..\..\tsrm" /D "_Debug_TS" /D ZEND_DEBUG=1 /D "_DEBUG" /D "XP_WIN32" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "_WINDOWS" /D "_USRDLL" /D "php4nsapi_EXPORTS" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 ns-httpd30.lib php4ts_debug.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 /base:"0x62000000" /version:4.0 /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\php_build\nsapi30\lib\\" /libpath:"..\..\Debug_TS" /libpath:"..\..\TSRM\Debug_TS" /libpath:"..\..\Zend\Debug_TS"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "php4nsapi - Win32 Release_TS"

-# Name "php4nsapi - Win32 Release_TS_inline"

-# Name "php4nsapi - Win32 Debug_TS"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\nsapi.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project