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

dmitry Fri Feb 3 16:31:09 2006 UTC Modified files: (Branch: PHP_4_4) /php-src/sapi/cgi cgi_main.c Log: iFixed several small FastCGI releated bugs http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.190.2.68.2.3&r2=1.190.2.68.2.4&diff_format=u Index: php-src/sapi/cgi/cgi_main.c diff -u php-src/sapi/cgi/cgi_main.c:1.190.2.68.2.3 php-src/sapi/cgi/cgi_main.c:1.190.2.68.2.4 --- php-src/sapi/cgi/cgi_main.c:1.190.2.68.2.3 Sun Jan 1 13:47:01 2006 +++ php-src/sapi/cgi/cgi_main.c Fri Feb 3 16:31:09 2006 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cgi_main.c,v 1.190.2.68.2.3 2006/01/01 13:47:01 sniper Exp $ */ +/* $Id: cgi_main.c,v 1.190.2.68.2.4 2006/02/03 16:31:09 dmitry Exp $ */ #include "php.h" #include "php_globals.h" @@ -281,7 +281,7 @@ #ifndef PHP_WIN32 !parent && #endif - (!request || FCGX_FFlush(request->out) == -1)) { + request && FCGX_FFlush(request->out) == -1) { php_handle_aborted_connection(); } return; @@ -1260,7 +1260,8 @@ fprintf( stderr, "Wait for kids, pid %d\n", getpid() ); #endif - wait( &status ); + while (wait( &status ) < 0) { + } running--; } } @@ -1688,6 +1689,7 @@ exit_status = 255; } zend_end_try(); + SG(server_context) = NULL; php_module_shutdown(TSRMLS_C); #ifdef ZTS