]> granicus.if.org Git - php/commitdiff
MFH
authorSebastian Bergmann <sebastian@php.net>
Fri, 6 Dec 2002 06:09:44 +0000 (06:09 +0000)
committerSebastian Bergmann <sebastian@php.net>
Fri, 6 Dec 2002 06:09:44 +0000 (06:09 +0000)
NEWS
sapi/fastcgi/CREDITS [deleted file]
sapi/fastcgi/Makefile.frag [deleted file]
sapi/fastcgi/README.Apache [deleted file]
sapi/fastcgi/README.FastCGI [deleted file]
sapi/fastcgi/config.m4 [deleted file]
sapi/fastcgi/fastcgi.c [deleted file]
sapi/fastcgi/fastcgi.dsp [deleted file]
sapi/fastcgi/php.sym [deleted file]
sapi/fastcgi/php_fastcgi.h [deleted file]
sapi/fastcgi/windows.txt [deleted file]

diff --git a/NEWS b/NEWS
index f36aa4d57e5c1c05d8801a1067dc38fc2150faec..a616ab0dba208e3c9b335330c6b3f68db6690f31 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,11 +4,12 @@ PHP 4                                                                      NEWS
 - ATTENTION! "make install" will *by default* install the CLI SAPI binary in 
   {PREFIX}/bin/php. If you don't disable the CGI binary, it will be
   installed as {PREFIX}/bin/php-cgi.
-- Removed extensions: (Jan, Jani)
+- Removed extensions: (Jan, Jani, Sebastian)
   . ext/aspell
   . ext/ccvs
   . ext/cybercash
   . ext/icap
+  . sapi/fastcgi
   . sapi/fhttpd
 - Moved extensions to PECL (http://pear.php.net/): (James, Derick)
   . ext/vpopmail
diff --git a/sapi/fastcgi/CREDITS b/sapi/fastcgi/CREDITS
deleted file mode 100644 (file)
index eb9cece..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-fastcgi
-Ben Mansell
-Stephen Landamore
-Daniel Silverstone
diff --git a/sapi/fastcgi/Makefile.frag b/sapi/fastcgi/Makefile.frag
deleted file mode 100644 (file)
index a5ce17a..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-$(SAPI_FASTCGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
-       $(BUILD_CGI)
diff --git a/sapi/fastcgi/README.Apache b/sapi/fastcgi/README.Apache
deleted file mode 100644 (file)
index c7a2172..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-Using FastCGI PHP with Apache
-=============================
-
-First of all, you may well ask 'Why?'. After all, Apache already has mod_php.
-However, there are advantages to running PHP with FastCGI. Separating the
-PHP code from the web server removes 'bloat' from the main server, and should
-improve the performance of non-PHP requests. Secondly, having one permanent
-PHP process as opposed to one per apache process means that shared resources
-like persistent database connections are used more efficiently.
-
-First of all, make sure that the FastCGI module is enabled. You should have
-a line in your config like:
-
-    LoadModule fastcgi_module /usr/lib/apache/1.3/mod_fastcgi.so
-
-Don't load mod_php, by the way. Make sure it is commented out!
-
-    #LoadModule php4_module /usr/lib/apache/1.3/libphp4.so
-
-Now, we'll create a fcgi-bin directory, just like you would do with normal
-CGI scripts. You'll need to create a directory somewhere to store your
-FastCGI binaries. We'll use /space/fcgi-bin/ for this example. Remember to
-copy the FastCGI-PHP binary in there. (named just 'php')
-
-    ScriptAlias /fcgi-bin/ /space/fcgi-bin/
-    <Location /fcgi-bin/>
-        SetHandler fastcgi-script
-    </Location>
-
-Next, we need to tell Apache to use the FastCGI binary /fcgi-bin/php to
-deliver PHP pages. All that is needed is:
-
-    AddType application/x-httpd-php .php
-    Action application/x-httpd-php /fcgi-bin/php
-
-Now, if you restart Apache, php pages should now be delivered!
-
-
-Running PHP-FastCGI separately from the webserver
--------------------------------------------------
-
-(Read README.FastCGI for why you might want to do this).
-Easy! Add one more configuration line:
-
-    FastCgiExternalServer /space/fcgi-bin/php -host localhost:8002
-
-Then, start the PHP off with the following command:
-
-    /space/fcgi-bin/php 8002
-
-The number 8002 is the port that PHP will listen on for requests - change this
-to anything suitable. And be sure to firewall it out so that external
-connections are denied!
diff --git a/sapi/fastcgi/README.FastCGI b/sapi/fastcgi/README.FastCGI
deleted file mode 100644 (file)
index f0c4af7..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-FastCGI module
---------------
-
-This module requires the FastCGI development kit, available from
-http://www.fastcgi.com/
-
-Before building PHP, please enter the dev kit, and run:
-
-./configure
-make
-make export
-
-This will compile the library code required for the FastCGI module. All
-that is then required is to configure PHP with the '--with-fastcgi' option.
-After making the code, you will end up with a binary file called 'php'.
-Installation of this file will depend on the web server being used, please
-see their documentation for details.
-
-
-
-Running the FastCGI PHP module
-------------------------------
-
-There are two ways to run the resulting 'php' binary after the fastcgi
-version has been built:
-
-1) Configure your web server to run the PHP binary itself.
-
-This is the simplest method, obviously you will have to configure your
-web server appropriately. Some web servers may also not support this method,
-or may not be as efficient.
-
-2) Run PHP separately from the web server.
-
-In this setup, PHP is started as a separate process entirely from the web
-server. It will listen on a socket for new FastCGI requests, and deliver
-PHP pages as appropriate. This is the recommended way of running PHP-FastCGI.
-To run this way, you must start the PHP binary running by giving it a port
-number to listen to on the command line, e.g.:
-
-./php 8002
-
-(you can also specify a bind address, e.g. ./php localhost:8002. However, this
- relies on the FastCGI devkit and does not seem to work properly)
-
-You must also configure your web server to connect to the appropriate port
-in order to talk to the PHP FastCGI process.
-
-The advantage of running PHP in this way is that it entirely separates the
-web server and PHP process, so that one cannot disrupt the other. It also
-allows PHP to be on an entirely separate machine from the web server if need
-be, you could even have several web servers utilising the same running PHP
-process if required!
-
-
-Security
---------
-
-Be sure to run the php binary as an appropriate userid. Also, firewall out
-the port that PHP is listening on. In addition, you can set the environment
-variable FCGI_WEB_SERVER_ADDRS to control who can connect to the FastCGI.
-Set it to a comma separated list of IP addresses, e.g.:
-
-export FCGI_WEB_SERVER_ADDRS=199.170.183.28,199.170.183.71
-
-
-Tuning
-------
-
-There are a few tuning parameters that can be tweaked to control the
-performance of FastCGI PHP. The following are environment variables that can
-be set before running the PHP binary:
-
-PHP_FCGI_CHILDREN  (default value: 8)
-
-This controls how many child processes the PHP process spawns. When the
-fastcgi starts, it creates a number of child processes which handle one
-page request at a time. So by default, you will be able to handle 8
-concurrent PHP page requests. Further requests will be queued.
-Increasing this number will allow for better concurrency, especially if you
-have pages that take a significant time to create, or supply a lot of data
-(e.g. downloading huge files via PHP). On the other hand, having more
-processes running will use more RAM, and letting too many PHP pages be
-generated concurrently will mean that each request will be slow.
-
-PHP_FCGI_MAX_REQUESTS (default value: 500)
-
-This controls how many requests each child process will handle before
-exitting. When one process exits, another will be created. This tuning is
-necessary because several PHP functions are known to have memory leaks. If the
-PHP processes were left around forever, they would be become very inefficient.
diff --git a/sapi/fastcgi/config.m4 b/sapi/fastcgi/config.m4
deleted file mode 100644 (file)
index 355bb08..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-dnl
-dnl $Id$
-dnl
-
-AC_MSG_CHECKING(for FastCGI support)
-AC_ARG_WITH(fastcgi,
-[  --with-fastcgi=SRCDIR   Build PHP as FastCGI application],[
-  if test "$withval" = "yes"; then
-        FASTCGIPATH=/usr/local
-  else
-        FASTCGIPATH=$withval
-  fi
-  
-  SAPI_FASTCGI_PATH=sapi/fastcgi/php
-  PHP_SUBST(SAPI_FASTCGI_PATH)
-  PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/fastcgi/Makefile.frag)
-  test -f "$FASTCGIPATH/lib/libfcgi.a" || AC_MSG_ERROR(Unable to find libfcgi.a in $FASTCGIPATH/lib)
-  test -f "$FASTCGIPATH/include/fastcgi.h" || AC_MSG_ERROR(Unable to find fastcgi.h in $FASTCGIPATH/include)
-  
-  PHP_SELECT_SAPI(fastcgi, program, fastcgi.c,,'$(SAPI_FASTCGI_PATH)') 
-
-  PHP_ADD_INCLUDE($FASTCGIPATH/include)
-  PHP_ADD_LIBRARY_WITH_PATH(fcgi, "$FASTCGIPATH/lib",)
-
-  INSTALL_IT="\$(INSTALL) -m 0755 \$(SAPI_FASTCGI_PATH) \$(bindir)/$SAPI_FASTCGI"
-  RESULT=yes
-  PHP_SUBST(FASTCGI_LIBADD)
-  PHP_SUBST(EXT_PROGRAM_LDADD)
-],[
-  RESULT=no
-])
-AC_MSG_RESULT($RESULT)
diff --git a/sapi/fastcgi/fastcgi.c b/sapi/fastcgi/fastcgi.c
deleted file mode 100644 (file)
index f943094..0000000
+++ /dev/null
@@ -1,630 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP Version 4                                                       |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2002 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: Ben Mansell <php@slimyhorror.com>                           |
-   +----------------------------------------------------------------------+
-*/
-
-/* Debugging */
-/* #define DEBUG_FASTCGI 1  */
-
-/* Two configurables for the FastCGI runner.
- *
- * PHP_FCGI_CHILDREN - if set, the FastCGI will pre-fork this many processes
- *                    which will accept requests.
- *
- * PHP_FCGI_MAX_REQUESTS - if set, the runner will kill itself after handling
- *                        the given number of requests. This is to curb any
- *                        memory leaks in PHP.
- */
-
-
-/* The following code is based mainly on the thttpd sapi and the original
- * CGI code, no doubt with many new and interesting bugs created... :)
- */
-
-#include "php.h"
-#include "SAPI.h"
-#include "php_main.h"
-#include "php_fastcgi.h"
-#include "php_variables.h"
-
-#include "fcgi_config.h"
-#include "fcgiapp.h"
-#include <stdio.h>
-#if HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#if HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef PHP_WIN32
-#include <io.h>
-#include <fcntl.h>
-#include "win32/php_registry.h"
-/* don't want to include fcgios.h, causes conflicts */
-extern int OS_SetImpersonate(void);
-#else
-#include <sys/wait.h>
-#endif
-#include <sys/stat.h>
-
-#if HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#if HAVE_SIGNAL_H
-#include <signal.h>
-#endif
-
-#ifndef S_ISREG
-#define S_ISREG(mode) ((mode) & _S_IFREG)
-#endif
-
-FCGX_Stream *in, *out, *err;
-FCGX_ParamArray envp;
-char *path_info = NULL;
-#ifndef PHP_WIN32
-struct sigaction act, old_term, old_quit, old_int;
-#endif
-
-/* Our original environment from when the FastCGI first started */
-char **orig_env;
-
-/* The environment given by the FastCGI */
-char **cgi_env;
-
-/* The manufactured environment, from merging the base environ with
- * the parameters set by the per-connection environment
- */
-char **merge_env;
-
-/**
- * Number of child processes that will get created to service requests
- */
-static int children = 8;
-
-/**
- * Set to non-zero if we are the parent process
- */
-static int parent = 1;
-
-/**
- * Process group
- */
-static pid_t pgroup;
-
-
-static int sapi_fastcgi_ub_write(const char *str, uint str_length TSRMLS_DC)
-{
-       uint sent = FCGX_PutStr( str, str_length, out );
-       return sent;
-}
-
-
-static void sapi_fastcgi_flush( void *server_context )
-{
-       if( FCGX_FFlush( out ) == -1 ) {
-               php_handle_aborted_connection();
-       }
-}
-
-
-static void sapi_fastcgi_send_header(sapi_header_struct *sapi_header, void *server_context TSRMLS_DC)
-{
-       if( sapi_header ) {
-#ifdef DEBUG_FASTCGI
-               fprintf( stderr, "Header: %s\n", sapi_header->header );
-#endif
-               FCGX_PutStr( sapi_header->header, sapi_header->header_len, out );
-       }
-       FCGX_PutStr( "\r\n", 2, out );
-}
-
-static int sapi_fastcgi_read_post(char *buffer, uint count_bytes TSRMLS_DC)
-{
-       size_t read_bytes = 0;
-       int c;
-       char *pos = buffer;
-
-       while( count_bytes ) {
-               c = FCGX_GetStr( pos, count_bytes, in );
-               read_bytes += c;
-               count_bytes -= c;
-               pos += c;
-               if( !c ) break;
-       }
-       return read_bytes;
-}
-
-static char *sapi_fastcgi_read_cookies(TSRMLS_D)
-{
-       return getenv( "HTTP_COOKIE" );
-}
-
-
-static void sapi_fastcgi_register_variables(zval *track_vars_array TSRMLS_DC)
-{
-       /* In CGI mode, we consider the environment to be a part of the server
-        * variables
-        */
-       php_import_environment_variables(track_vars_array TSRMLS_CC);
-
-       /* Build the special-case PHP_SELF variable for the CGI version */
-       php_register_variable("PHP_SELF", (SG(request_info).request_uri ? SG(request_info).request_uri:""), track_vars_array TSRMLS_CC);
-}
-
-
-static void sapi_fastcgi_log_message(char *message)
-{
-#ifdef DEBUG_FASTCGI
-       fprintf( stderr, "Log Message: %s\n", message );
-#endif
-       FCGX_FPrintF(err, "%s\n", message);
-}
-
-
-static int php_fastcgi_startup(sapi_module_struct *sapi_module)
-{
-       if (php_module_startup(sapi_module, NULL, 0)==FAILURE) {
-               return FAILURE;
-       }
-       return SUCCESS;
-}
-
-
-static sapi_module_struct fastcgi_sapi_module = {
-       "fastcgi",
-       "FastCGI",
-       
-       php_fastcgi_startup,
-       php_module_shutdown_wrapper,
-       
-       NULL,                                                                   /* activate */
-       NULL,                                                                   /* deactivate */
-
-       sapi_fastcgi_ub_write,
-       sapi_fastcgi_flush,
-       NULL,                                                                   /* get uid */
-       NULL,                                                                   /* getenv */
-
-       php_error,
-       
-       NULL,
-       NULL,
-       sapi_fastcgi_send_header,
-       sapi_fastcgi_read_post,
-       sapi_fastcgi_read_cookies,
-
-       sapi_fastcgi_register_variables,
-       sapi_fastcgi_log_message,
-
-       NULL,                                                                   /* Block interruptions */
-       NULL,                                                                   /* Unblock interruptions */
-
-       STANDARD_SAPI_MODULE_PROPERTIES
-};
-
-static void fastcgi_module_main(TSRMLS_D)
-{
-       zend_file_handle file_handle;
-       int c, retval = 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;
-
-       /* eat the bang line */
-       if (SG(request_info).path_translated) {
-               retval = php_fopen_primary_script(&file_handle TSRMLS_CC);
-       }
-
-       if (retval == SUCCESS) {
-               /* #!php support */
-               c = fgetc(file_handle.handle.fp);
-               if (c == '#') {
-                       while (c != 10 && c != 13) {
-                               c = fgetc(file_handle.handle.fp);       /* skip to end of line */
-                       }
-                       CG(zend_lineno) = -2;
-               } else {
-                       rewind(file_handle.handle.fp);
-               }
-       }
-
-       if (php_request_startup(TSRMLS_C) == SUCCESS) {
-               php_execute_script(&file_handle TSRMLS_CC);
-               php_request_shutdown(NULL);
-       }
-}
-
-
-static int init_request_info( TSRMLS_D )
-{
-       char *content_length = getenv("CONTENT_LENGTH");
-       char *content_type = getenv( "CONTENT_TYPE" );
-       const char *auth;
-       struct stat st;
-       char *pi = getenv( "PATH_INFO" );
-       char *pt = getenv( "PATH_TRANSLATED" );
-       if (!pt) {
-               pt = getenv("SCRIPT_FILENAME"); // apache mod_fastcgi sets this
-       }
-       path_info = strdup( pi );
-
-       SG(request_info).request_method = getenv("REQUEST_METHOD");
-       SG(request_info).query_string = getenv("QUERY_STRING");
-       SG(request_info).request_uri = path_info;
-       if (!SG(request_info).request_uri) {
-               SG(request_info).request_uri = getenv("SCRIPT_NAME");
-       }
-       SG(request_info).content_type = ( content_type ? content_type : "" );
-       SG(request_info).content_length = (content_length?atoi(content_length):0);
-       SG(sapi_headers).http_response_code = 200;
-
-       SG(request_info).path_translated = pt;
-       if (!pt) return -1;
-       /*
-        * if the file doesn't exist, try to extract PATH_INFO out
-        * of it by stat'ing back through the '/'
-        */
-       if ( stat( pt, &st ) == -1 ) {
-          int len = strlen(pt);
-          char *ptr;
-          while( ptr = strrchr(pt,'/') ) {
-             *ptr = 0;
-             if ( stat(pt, &st) == 0 && S_ISREG(st.st_mode) ) {
-                /*
-                 * okay, we found the base script!
-                 * work out how many chars we had to strip off;
-                 * then we can modify PATH_INFO
-                 * accordingly
-                 */
-                int slen = len - strlen(pt);
-                if ( pi ) {
-                   int pilen = strlen( pi );
-                   strcpy( pi, pi + pilen - slen );
-                }
-                break;
-             }
-          }
-          /*
-           * if we stripped out all the '/' and still didn't find
-           * a valid path... we will fail, badly. of course we would
-           * have failed anyway... is there a nice way to error?
-           */
-       } else {
-          /* the first stat succeeded... */
-          if ( pi ) *pi = 0;
-       }
-
-       /* The CGI RFC allows servers to pass on unvalidated Authorization data */
-       auth = getenv("HTTP_AUTHORIZATION");
-#ifdef DEBUG_FASTCGI
-       fprintf( stderr, "Authorization: %s\n", auth );
-#endif
-       php_handle_auth_data(auth TSRMLS_CC);
-
-       return 0;
-}
-
-
-void fastcgi_php_init(void)
-{
-       TSRMLS_FETCH();
-       sapi_startup(&fastcgi_sapi_module);
-       fastcgi_sapi_module.startup(&fastcgi_sapi_module);
-       SG(server_context) = (void *) 1;
-}
-
-void fastcgi_php_shutdown(void)
-{
-       TSRMLS_FETCH();
-       if (SG(server_context) != NULL) {
-               fastcgi_sapi_module.shutdown(&fastcgi_sapi_module);
-               sapi_shutdown();
-       }
-}
-
-
-/**
- * Clean up child processes upon exit
- */
-void fastcgi_cleanup(int signal)
-{
-
-#ifdef DEBUG_FASTCGI
-       fprintf( stderr, "FastCGI shutdown, pid %d\n", getpid() );
-#endif
-
-#ifndef PHP_WIN32
-       sigaction( SIGTERM, &old_term, 0 );
-
-       /* Kill all the processes in our process group */
-       kill( -pgroup, SIGTERM );
-#endif
-
-       /* We should exit at this point, but MacOSX doesn't seem to */
-       exit( 0 );
-}
-
-
-int main(int argc, char *argv[])
-{
-       int exit_status = SUCCESS;
-#ifndef PHP_WIN32
-       int c, i, len;
-       zend_file_handle file_handle;
-       char *s;
-       int status;
-#else
-       int impersonate = 0;
-#endif
-       char *argv0=NULL;
-       char *script_file=NULL;
-       zend_llist global_vars;
-       int max_requests = 500;
-       int requests = 0;
-       int fcgi_fd = 0;
-       int env_size, cgi_env_size;
-       FCGX_Request request;
-#ifdef ZTS
-       zend_compiler_globals *compiler_globals;
-       zend_executor_globals *executor_globals;
-       php_core_globals *core_globals;
-       sapi_globals_struct *sapi_globals;
-       void ***tsrm_ls;
-#endif
-
-#ifdef DEBUG_FASTCGI
-       fprintf( stderr, "Initialising now, pid %d!\n", getpid() );
-#endif
-
-       if( FCGX_IsCGI() ) {
-               /* Did a bind address or port get configured on the command line? */
-               if( argc >= 2 ) {
-                       /* Pass on the arg to the FastCGI library, with one exception.
-                        * If just a port is specified, then we prepend a ':' onto the
-                        * path (it's what the fastcgi library expects)
-                        */
-                       int port = atoi( argv[ 1 ] );
-                       if( port ) {
-                               char bindport[ 32 ];
-                               snprintf( bindport, 32, ":%s", argv[ 1 ] );
-                               fcgi_fd = FCGX_OpenSocket( bindport, 128 );
-                       } else {
-                               fcgi_fd = FCGX_OpenSocket( argv[ 1 ], 128 );
-                       }
-                       if( fcgi_fd < 0 ) {
-                               fprintf( stderr, "Couldn't create FastCGI listen socket\n" );
-                               exit( 1 );
-                       }
-               } else {
-                       fprintf( stderr, "The FastCGI version of PHP cannot be "
-                                        "run as a CGI application\n" );
-                       exit( 1 );
-               }
-       }
-
-       /* Calculate environment size */
-       env_size = 0;
-       while( environ[ env_size ] ) { env_size++; }
-       /* Also include the final NULL pointer */
-       env_size++;
-
-       /* Allocate for our environment */
-       orig_env = malloc( env_size * sizeof( char *));
-       if( !orig_env ) {
-               perror( "Can't malloc environment" );
-               exit( 1 );
-       }
-       memcpy( orig_env, environ, env_size * sizeof( char *));
-
-#ifdef HAVE_SIGNAL_H
-#if defined(SIGPIPE) && defined(SIG_IGN)
-       signal(SIGPIPE, SIG_IGN); /* ignore SIGPIPE in standalone mode so
-                                   that sockets created via fsockopen()
-                                   don't kill PHP if the remote site
-                                   closes it.  in apache|apxs mode apache
-                                   does that for us!  thies@thieso.net
-                                   20000419 */
-#endif
-#endif
-       
-#ifdef ZTS
-       tsrm_startup(1, 1, 0, NULL);
-#endif
-       sapi_startup(&fastcgi_sapi_module);
-#ifdef PHP_WIN32
-       _fmode = _O_BINARY;                     /*sets default for file streams to binary */
-       setmode(_fileno(stdin), O_BINARY);              /* make the stdio mode be binary */
-       setmode(_fileno(stdout), O_BINARY);             /* make the stdio mode be binary */
-       setmode(_fileno(stderr), O_BINARY);             /* make the stdio mode be binary */
-#endif
-
-       if (php_module_startup(&fastcgi_sapi_module, NULL, 0)==FAILURE) {
-               return FAILURE;
-       }
-#ifdef ZTS
-       compiler_globals = ts_resource(compiler_globals_id);
-       executor_globals = ts_resource(executor_globals_id);
-       core_globals = ts_resource(core_globals_id);
-       sapi_globals = ts_resource(sapi_globals_id);
-       tsrm_ls = ts_resource(0);
-#endif
-
-       /* How many times to run PHP scripts before dying */
-       if( getenv( "PHP_FCGI_MAX_REQUESTS" )) {
-               max_requests = atoi( getenv( "PHP_FCGI_MAX_REQUESTS" ));
-               if( !max_requests ) {
-                       fprintf( stderr,
-                                "PHP_FCGI_MAX_REQUESTS is not valid\n" );
-                       exit( 1 );
-               }
-       }
-
-               /* Initialise FastCGI request structure */
-       FCGX_Init();
-       FCGX_InitRequest( &request, fcgi_fd, 0 );
-
-#ifndef PHP_WIN32
-       /* Pre-fork, if required */
-       if( getenv( "PHP_FCGI_CHILDREN" )) {
-               children = atoi( getenv( "PHP_FCGI_CHILDREN" ));
-               if( !children ) {
-                       fprintf( stderr,
-                                "PHP_FCGI_CHILDREN is not valid\n" );
-                       exit( 1 );
-               }
-       }
-
-       if( children ) {
-               int running = 0;
-               int i;
-               pid_t pid;
-
-               /* Create a process group for ourself & children */
-               setsid();
-               pgroup = getpgrp();
-#ifdef DEBUG_FASTCGI
-               fprintf( stderr, "Process group %d\n", pgroup );
-#endif
-
-               /* Set up handler to kill children upon exit */
-               act.sa_flags = 0;
-               act.sa_handler = fastcgi_cleanup;
-               if( sigaction( SIGTERM, &act, &old_term ) ||
-                   sigaction( SIGINT, &act, &old_int ) ||
-                   sigaction( SIGQUIT, &act, &old_quit )) {
-                       perror( "Can't set signals" );
-                       exit( 1 );
-               }
-
-               while( parent ) {
-                       do {
-#ifdef DEBUG_FASTCGI
-                               fprintf( stderr, "Forking, %d running\n",
-                                        running );
-#endif
-                               pid = fork();
-                               switch( pid ) {
-                               case 0:
-                                       /* One of the children.
-                                        * Make sure we don't go round the
-                                        * fork loop any more
-                                        */
-                                       parent = 0;
-
-                                       /* don't catch our signals */
-                                       sigaction( SIGTERM, &old_term, 0 );
-                                       sigaction( SIGQUIT, &old_quit, 0 );
-                                       sigaction( SIGINT, &old_int, 0 );
-                                       break;
-                               case -1:
-                                       perror( "php (pre-forking)" );
-                                       exit( 1 );
-                                       break;
-                               default:
-                                       /* Fine */
-                                       running++;
-                                       break;
-                               }
-                       } while( parent && ( running < children ));
-
-                       if( parent ) {
-#ifdef DEBUG_FASTCGI
-                               fprintf( stderr, "Wait for kids, pid %d\n",
-                                        getpid() );
-#endif
-                               wait( &status );
-                               running--;
-                       }
-               }
-       }
-
-#endif /* WIN32 */
-
-       /* Main FastCGI loop */
-#ifdef DEBUG_FASTCGI
-       fprintf( stderr, "Going into accept loop\n" );
-#endif
-#ifdef PHP_WIN32
-       /* attempt to set security impersonation for fastcgi
-          will only happen on NT based OS, others will ignore it. */
-       if (cfg_get_long("fastcgi.impersonate", &impersonate) == FAILURE) {
-               impersonate = 0;
-       }
-       if (impersonate) OS_SetImpersonate();
-#endif
-
-       while( FCGX_Accept_r( &request ) >= 0 ) {
-
-#ifdef DEBUG_FASTCGI
-               fprintf( stderr, "Got accept\n" );
-#endif
-
-               in = request.in;
-               out = request.out;
-               err = request.err;
-               cgi_env = request.envp;
-               cgi_env_size = 0;
-               while( cgi_env[ cgi_env_size ] ) { cgi_env_size++; }
-               merge_env = malloc( (env_size+cgi_env_size)*sizeof(char*) );
-               if( !merge_env ) {
-                  perror( "Can't malloc environment" );
-                  exit( 1 );
-               }
-               memcpy( merge_env, orig_env, (env_size-1)*sizeof(char *) );
-               memcpy( merge_env + env_size - 1,
-                       cgi_env, (cgi_env_size+1)*sizeof(char *) );
-               environ = merge_env;
-
-               if (init_request_info(TSRMLS_C)!=0) {
-                       /* we received some invalid environment */
-                       //char *b = "Can't init the request\n";
-                       //sapi_fastcgi_ub_write(b, strlen(b) TSRMLS_C);
-                       //FCGX_Finish();
-                       //break;
-               }
-               SG(server_context) = (void *) 1; /* avoid server_context==NULL checks */
-               SG(request_info).argv0 = argv0;                
-               zend_llist_init(&global_vars, sizeof(char *), NULL, 0);
-
-               fastcgi_module_main(TSRMLS_C);
-               if( path_info ) {
-                  free( path_info );
-                  path_info = NULL;
-               }
-
-               /* TODO: We should free our environment here, but
-                * some platforms are unhappy if they've altered our
-                * existing environment and we then free() the new
-                * environ pointer
-                */
-
-               requests++;
-               if( max_requests && ( requests == max_requests )) {
-                       FCGX_Finish();
-                       break;
-               }
-       }
-
-#ifdef ZTS
-       tsrm_shutdown();
-#endif
-#ifdef DEBUG_FASTCGI
-       fprintf( stderr, "Exiting...\n" );
-#endif
-       return 0;
-}
diff --git a/sapi/fastcgi/fastcgi.dsp b/sapi/fastcgi/fastcgi.dsp
deleted file mode 100644 (file)
index 520396c..0000000
+++ /dev/null
@@ -1,195 +0,0 @@
-# Microsoft Developer Studio Project File - Name="fastcgi" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Console Application" 0x0103\r
-\r
-CFG=fastcgi - Win32 Debug_TS\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "fastcgi.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "fastcgi.mak" CFG="fastcgi - Win32 Debug_TS"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "fastcgi - Win32 Release" (based on "Win32 (x86) Console Application")\r
-!MESSAGE "fastcgi - Win32 Debug" (based on "Win32 (x86) Console Application")\r
-!MESSAGE "fastcgi - Win32 Debug_TS" (based on "Win32 (x86) Console Application")\r
-!MESSAGE "fastcgi - Win32 Release_TS" (based on "Win32 (x86) Console Application")\r
-!MESSAGE "fastcgi - Win32 Release_TS_inline" (based on "Win32 (x86) Console Application")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""\r
-# PROP Scc_LocalPath ""\r
-CPP=cl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "fastcgi - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Release"\r
-# PROP BASE Intermediate_Dir "Release"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\Release"\r
-# PROP Intermediate_Dir "..\..\Release"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\regex\\" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "fcgi\include" /D "NDEBUG" /D "_CONSOLE" /D ZEND_DEBUG=0 /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /Fr /FD /c\r
-# SUBTRACT CPP /YX\r
-# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
-# ADD RSC /l 0x409 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# 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 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 /subsystem:console /machine:I386\r
-# ADD LINK32 php4nts.lib libfcgi.lib winmm.lib wsock32.lib netapi32.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 /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\..\Release/phpfcgi.exe" /libpath:"..\..\Release" /libpath:"fcgi\lib"\r
-\r
-!ELSEIF  "$(CFG)" == "fastcgi - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "Debug"\r
-# PROP BASE Intermediate_Dir "Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\Debug"\r
-# PROP Intermediate_Dir "Debug"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\regex\\" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "fcgi\include" /D "DEBUG" /D "_DEBUG" /D "_CONSOLE" /D "MSVC5" /D "PHP_WIN32" /D ZEND_DEBUG=1 /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /FD /GZ /c\r
-# SUBTRACT CPP /YX\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
-# ADD RSC /l 0x409 /d "_DEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# 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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 libfcgi.lib winmm.lib wsock32.lib netapi32.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 php4nts_debug.lib /nologo /version:4.0 /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"..\Debug\phpfcgi.exe" /pdbtype:sept /libpath:"..\..\Debug" /libpath:"fcgi\lib"\r
-\r
-!ELSEIF  "$(CFG)" == "fastcgi - Win32 Debug_TS"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "fastcgi___Win32_Debug_TS"\r
-# PROP BASE Intermediate_Dir "fastcgi___Win32_Debug_TS"\r
-# PROP BASE Ignore_Export_Lib 0\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\Debug_TS"\r
-# PROP Intermediate_Dir "Debug_TS"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\regex\\" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "fcgi\include" /D "DEBUG" /D "_DEBUG" /D "_CONSOLE" /D "MSVC5" /D "PHP_WIN32" /D ZEND_DEBUG=1 /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /FD /GZ /c\r
-# SUBTRACT BASE CPP /YX\r
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\regex\\" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "fcgi\include" /D "DEBUG" /D "_DEBUG" /D "_CONSOLE" /D "MSVC5" /D "PHP_WIN32" /D "ZTS" /D ZEND_DEBUG=1 /D "ZEND_WIN32" /D "WIN32" /D "_MBCS" /FR /FD /GZ /c\r
-# SUBTRACT CPP /YX\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
-# ADD RSC /l 0x409 /d "_DEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 libfcgi.lib winmm.lib wsock32.lib netapi32.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 php4nts_debug.lib /nologo /version:4.0 /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"c:\php-fcgi\php-fcgi.exe" /pdbtype:sept /libpath:"..\..\Debug" /libpath:"fcgi\lib"\r
-# ADD LINK32 libfcgi.lib winmm.lib wsock32.lib netapi32.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 php4ts_debug.lib /nologo /version:4.0 /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"..\..\Debug_TS\phpfcgi.exe" /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"fcgi\lib"\r
-\r
-!ELSEIF  "$(CFG)" == "fastcgi - Win32 Release_TS"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "fastcgi___Win32_Release_TS"\r
-# PROP BASE Intermediate_Dir "fastcgi___Win32_Release_TS"\r
-# PROP BASE Ignore_Export_Lib 0\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\Release_TS"\r
-# PROP Intermediate_Dir "Release_TS"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\regex\\" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "fcgi\include" /D "NDEBUG" /D "_CONSOLE" /D ZEND_DEBUG=0 /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /Fr /FD /c\r
-# SUBTRACT BASE CPP /YX\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\regex\\" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "fcgi\include" /D "NDEBUG" /D "_CONSOLE" /D ZEND_DEBUG=0 /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "ZTS" /Fr /FD /c\r
-# SUBTRACT CPP /YX\r
-# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
-# ADD RSC /l 0x409 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 php4nts.lib libfcgi.lib winmm.lib wsock32.lib netapi32.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 /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\..\Release/php-fcgi.exe" /libpath:"..\..\Release" /libpath:"fcgi\lib"\r
-# ADD LINK32 php4ts.lib libfcgi.lib winmm.lib wsock32.lib netapi32.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 /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\..\Release_TS/phpfcgi.exe" /libpath:"..\..\Release_TS" /libpath:"fcgi\lib"\r
-\r
-!ELSEIF  "$(CFG)" == "fastcgi - Win32 Release_TS_inline"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "fastcgi___Win32_Release_TS_inline"\r
-# PROP BASE Intermediate_Dir "fastcgi___Win32_Release_TS_inline"\r
-# PROP BASE Ignore_Export_Lib 0\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\Release_TS_inline"\r
-# PROP Intermediate_Dir "Release_TS_inline"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\regex\\" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "fcgi\include" /D "NDEBUG" /D "_CONSOLE" /D ZEND_DEBUG=0 /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "ZTS" /Fr /FD /c\r
-# SUBTRACT BASE CPP /YX\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\regex\\" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /I "fcgi\include" /D "NDEBUG" /D "_CONSOLE" /D "ZEND_WIN32_FORCE_INLINE" /D ZEND_DEBUG=0 /D "MSVC5" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "ZTS" /Fr /FD /c\r
-# SUBTRACT CPP /YX\r
-# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
-# ADD RSC /l 0x409 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 php4ts.lib libfcgi.lib winmm.lib wsock32.lib netapi32.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 /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\..\Release_TS/phpfcgi.exe" /libpath:"..\..\Release_TS" /libpath:"fcgi\lib"\r
-# ADD LINK32 php4ts.lib libfcgi.lib winmm.lib wsock32.lib netapi32.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 /version:4.0 /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\..\Release_TS_inline/phpfcgi.exe" /libpath:"..\..\Release_TS_inline" /libpath:"fcgi\lib"\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "fastcgi - Win32 Release"\r
-# Name "fastcgi - Win32 Debug"\r
-# Name "fastcgi - Win32 Debug_TS"\r
-# Name "fastcgi - Win32 Release_TS"\r
-# Name "fastcgi - Win32 Release_TS_inline"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-# Begin Source File\r
-\r
-SOURCE=.\fastcgi.c\r
-# End Source File\r
-# End Group\r
-# Begin Group "Header Files"\r
-\r
-# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
-# Begin Source File\r
-\r
-SOURCE=.\php_fastcgi.h\r
-# End Source File\r
-# End Group\r
-# Begin Group "Resource Files"\r
-\r
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
-# End Group\r
-# End Target\r
-# End Project\r
diff --git a/sapi/fastcgi/php.sym b/sapi/fastcgi/php.sym
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/sapi/fastcgi/php_fastcgi.h b/sapi/fastcgi/php_fastcgi.h
deleted file mode 100644 (file)
index 60f93e2..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP Version 4                                                        |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2002 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: Sascha Schumann <sascha@schumann.cx>                         |
-   +----------------------------------------------------------------------+
-*/
-
-#ifndef PHP_FASTCGI_H
-#define PHP_FASTCGI_H
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-void    fastcgi_php_shutdown(void);
-void    fastcgi_php_init(void);
-
-#endif
diff --git a/sapi/fastcgi/windows.txt b/sapi/fastcgi/windows.txt
deleted file mode 100644 (file)
index fc12b0a..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-Windows support is currently experimental.
-
-Tested under IIS with cgi-fcgi.exe and Apache with mod_fastcgi.
-
-Compilation:
-Currently only supports Non-Thread safe compilation, however, 
-that is realy all that is needed :)
-
-Get the devkit from www.fastcgi.com, build it.
-Create the directories 
-       php4/sapi/fastcgi/fcgi
-       php4/sapi/fastcgi/fcgi/include
-       php4/sapi/fastcgi/fcgi/lib
-Place headers and libs in the include and lib directories.
-Load the php.dsw, and compile.
-
-IIS configuration:
-
-Under the application configuration in the IIS configuration program, use:
-.php C:\php-fcgi\cgi-fcgi.exe -connect php c:\php-fcgi\php-fcgi.exe
-
-Apache Configuration:
-
-LoadModule fastcgi_module  modules/mod_fastcgi.dll
-<IfModule mod_fastcgi.c>
-AddHandler fastcgi-script fphp php
-</IfModule>
-
-The scripts require the bang line as the first line
-of the script to work with mod_fastcgi,
-#!c:/php-fcgi/php-fcgi.exe
-
-TODO:
-make 'thread-safe' compilation, though it isn't necessary.
-