iliaa Tue Feb 10 12:44:31 2004 EDT
Modified files:
/php-src/sapi/cgi cgi_main.c
/php-src/sapi/cgi/libfcgi/include fcgi_config.h
Log:
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.
http://cvs.php.net/diff.php/php-src/sapi/cgi/cgi_main.c?r1=1.246&r2=1.247&ty=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.246 php-src/sapi/cgi/cgi_main.c:1.247
--- php-src/sapi/cgi/cgi_main.c:1.246 Mon Feb 9 19:29:46 2004
+++ php-src/sapi/cgi/cgi_main.c Tue Feb 10 12:44:30 2004
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.246 2004/02/10 00:29:46 iliaa Exp $ */
+/* $Id: cgi_main.c,v 1.247 2004/02/10 17:44:30 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
@@ -271,7 +273,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;
@@ -1177,7 +1183,6 @@
if( children ) {
int running = 0;
- int i;
pid_t pid;
/* Create a process group for ourself & children */
http://cvs.php.net/diff.php/php-src/sapi/cgi/libfcgi/include/fcgi_config.h?r1=1.2&r2=1.3&ty=u
Index: php-src/sapi/cgi/libfcgi/include/fcgi_config.h
diff -u php-src/sapi/cgi/libfcgi/include/fcgi_config.h:1.2
php-src/sapi/cgi/libfcgi/include/fcgi_config.h:1.3
--- php-src/sapi/cgi/libfcgi/include/fcgi_config.h:1.2 Tue Nov 26 00:51:16 2002
+++ php-src/sapi/cgi/libfcgi/include/fcgi_config.h Tue Feb 10 12:44:31 2004
@@ -2,6 +2,6 @@
#ifdef _WIN32
#include "fcgi_config_win32.h"
#else
-#include "main/php_config.h"
+#include "php_config.h"
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
