cvs: php-src(PHP_4_3) /sapi/cgi cgi_main.c

iliaa Tue Feb 10 12:44:45 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/sapi/cgi cgi_main.c Log: MFH: Fixed win32 build. Added missing headers needed for wait(). Removed duplicate signal.h header. http://cvs.php.net/diff.php/php-src/sapi/cgi/cgi_main.c?r1=1.190.2.55&r2=1.190.2.56&ty=u Index: php-src/sapi/cgi/cgi_main.c diff -u php-src/sapi/cgi/cgi_main.c:1.190.2.55 php-src/sapi/cgi/cgi_main.c:1.190.2.56 --- php-src/sapi/cgi/cgi_main.c:1.190.2.55 Mon Feb 9 19:30:03 2004 +++ php-src/sapi/cgi/cgi_main.c Tue Feb 10 12:44:44 2004 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cgi_main.c,v 1.190.2.55 2004/02/10 00:30:03 iliaa Exp $ */ +/* $Id: cgi_main.c,v 1.190.2.56 2004/02/10 17:44:44 iliaa Exp $ */ #include "php.h" #include "php_globals.h" @@ -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 @@ -275,7 +277,11 @@ #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;