diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2004-02-10 17:44:31 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2004-02-10 17:44:31 +0000 |
| commit | 9c1be88844f04f3cff3e841e39a93552ba779eff (patch) | |
| tree | 505e799d34c1b792478827991967d25e85421999 | |
| parent | f069be85bf5b6d2939e6bc35a91e2b11ccb5d00f (diff) | |
| download | php-git-9c1be88844f04f3cff3e841e39a93552ba779eff.tar.gz | |
Fixed win32 build.
Fixed building of libfcgi when PHP is built from another directory.
Added missing headers needed for wait().
Removed duplicate signal.h header.
Removed unneeded variables.
| -rw-r--r-- | sapi/cgi/cgi_main.c | 17 | ||||
| -rw-r--r-- | sapi/cgi/libfcgi/include/fcgi_config.h | 2 |
2 files changed, 12 insertions, 7 deletions
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 2580a14b27..6ab6c4f9e2 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -48,6 +48,12 @@ #if HAVE_SETLOCALE #include <locale.h> #endif +#if HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#if HAVE_SYS_WAIT_H +#include <sys/wait.h> +#endif #include "zend.h" #include "zend_extensions.h" #include "php_ini.h" @@ -61,10 +67,6 @@ #include "win32/php_registry.h" #endif -#if HAVE_SIGNAL_H -#include <signal.h> -#endif - #ifdef __riscos__ #include <unixlib/local.h> #endif @@ -271,7 +273,11 @@ static void sapi_cgibin_flush(void *server_context) #if PHP_FASTCGI if (!FCGX_IsCGI()) { FCGX_Request *request = (FCGX_Request *)server_context; - if (!parent && (!request || FCGX_FFlush(request->out) == -1)) { + if ( +#ifdef PHP_WIN32 + !parent && +#endif + (!request || FCGX_FFlush(request->out) == -1)) { php_handle_aborted_connection(); } return; @@ -1177,7 +1183,6 @@ consult the installation file that came with this distribution, or visit \n\ if( children ) { int running = 0; - int i; pid_t pid; /* Create a process group for ourself & children */ diff --git a/sapi/cgi/libfcgi/include/fcgi_config.h b/sapi/cgi/libfcgi/include/fcgi_config.h index 22256df328..bb031a0bb7 100644 --- a/sapi/cgi/libfcgi/include/fcgi_config.h +++ b/sapi/cgi/libfcgi/include/fcgi_config.h @@ -2,6 +2,6 @@ #ifdef _WIN32 #include "fcgi_config_win32.h" #else -#include "main/php_config.h" +#include "php_config.h" #endif |