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

From: Date: Fri, 16 Feb 2007 11:47:20 +0000
Subject: cvs: php-src(PHP_4_4) / NEWS /sapi/cgi cgi_main.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-43093@lists.php.net to get a copy of this message
dmitry Fri Feb 16 11:47:20 2007 UTC Modified files: (Branch: PHP_4_4) /php-src NEWS /php-src/sapi/cgi cgi_main.c Log: Fixed bug #40286 (PHP fastcgi with PHP_FCGI_CHILDREN don't kill children when parent is killed) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.194&r2=1.1247.2.920.2.195&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.194 php-src/NEWS:1.1247.2.920.2.195 --- php-src/NEWS:1.1247.2.920.2.194 Fri Feb 16 08:21:30 2007 +++ php-src/NEWS Fri Feb 16 11:47:19 2007 @@ -4,6 +4,8 @@ - Updated PCRE to version 7.0. (Nuno) - Fixed segfault in ext/session when register_globals=On. (Tony) - Fixed bug #40502 (ext/interbase compile failure). (Tony) +- Fixed bug #40286 (PHP fastcgi with PHP_FCGI_CHILDREN don't kill children when + parent is killed). (Dmitry) 14 Feb 2007, Version 4.4.5 - Upgraded PEAR to 1.5.0. (Greg) http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.190.2.68.2.7&r2=1.190.2.68.2.8&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.7 php-src/sapi/cgi/cgi_main.c:1.190.2.68.2.8 --- php-src/sapi/cgi/cgi_main.c:1.190.2.68.2.7 Mon Jan 1 09:46:51 2007 +++ php-src/sapi/cgi/cgi_main.c Fri Feb 16 11:47:20 2007 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cgi_main.c,v 1.190.2.68.2.7 2007/01/01 09:46:51 sebastian Exp $ */ +/* $Id: cgi_main.c,v 1.190.2.68.2.8 2007/02/16 11:47:20 dmitry Exp $ */ #include "php.h" #include "php_globals.h" @@ -351,18 +351,14 @@ static int sapi_cgi_read_post(char *buffer, uint count_bytes TSRMLS_DC) { - uint read_bytes=0, tmp_read_bytes; -#if PHP_FASTCGI - char *pos = buffer; -#endif + int read_bytes=0, tmp_read_bytes; count_bytes = MIN(count_bytes, (uint)SG(request_info).content_length-SG(read_post_bytes)); while (read_bytes < count_bytes) { #if PHP_FASTCGI if (!FCGX_IsCGI()) { FCGX_Request *request = (FCGX_Request *)SG(server_context); - tmp_read_bytes = FCGX_GetStr( pos, count_bytes-read_bytes, request->in ); - pos += tmp_read_bytes; + tmp_read_bytes = FCGX_GetStr(buffer+read_bytes, count_bytes-read_bytes, request->in ); } else { tmp_read_bytes = read(0, buffer+read_bytes, count_bytes-read_bytes); }

« previous php.cvs (#43093) next »