cvs: php4(PHP_4_3) /ext/standard php_fopen_wrapper.c /main SAPI.c

hholzgra Thu Nov 21 05:53:18 2002 EDT Modified files: (Branch: PHP_4_3) /php4/main SAPI.c /php4/ext/standard php_fopen_wrapper.c Log: MFH Index: php4/main/SAPI.c diff -u php4/main/SAPI.c:1.155 php4/main/SAPI.c:1.155.2.1 --- php4/main/SAPI.c:1.155 Tue Nov 12 13:29:11 2002 +++ php4/main/SAPI.c Thu Nov 21 05:53:18 2002 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: SAPI.c,v 1.155 2002/11/12 18:29:11 hholzgra Exp $ */ +/* $Id: SAPI.c,v 1.155.2.1 2002/11/21 10:53:18 hholzgra Exp $ */ #include <ctype.h> #include <sys/stat.h> @@ -358,8 +358,10 @@ if(sapi_module.read_post) { /* make sure we've consumed all request input data */ char dummy[SAPI_POST_BLOCK_SIZE]; - while(sapi_module.read_post(dummy, sizeof(dummy)-1 TSRMLS_CC) > 0) { - /* empty loop body */ + int read_bytes; + + while((read_bytes = sapi_module.read_post(dummy, sizeof(dummy)-1 TSRMLS_CC)) > 0) { + SG(read_post_bytes) += read_bytes; } } } Index: php4/ext/standard/php_fopen_wrapper.c diff -u php4/ext/standard/php_fopen_wrapper.c:1.29 php4/ext/standard/php_fopen_wrapper.c:1.29.2.1 --- php4/ext/standard/php_fopen_wrapper.c:1.29 Tue Nov 12 13:29:11 2002 +++ php4/ext/standard/php_fopen_wrapper.c Thu Nov 21 05:53:18 2002 @@ -17,7 +17,7 @@ | Hartmut Holzgraefe <hholzgra@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_fopen_wrapper.c,v 1.29 2002/11/12 18:29:11 hholzgra Exp $ */ +/* $Id: php_fopen_wrapper.c,v 1.29.2.1 2002/11/21 10:53:18 hholzgra Exp $ */ #include <stdio.h> #include <stdlib.h> @@ -95,8 +95,8 @@ stream->eof = 1; } } - - return read_bytes; + SG(read_post_bytes) += read_bytes; + return read_bytes; } static int php_stream_input_close(php_stream *stream, int close_handle TSRMLS_DC)