cvs: php4 /ext/standard php_fopen_wrapper.c /main SAPI.c

hholzgra Thu Nov 21 05:29:12 2002 EDT Modified files: /php4/main SAPI.c /php4/ext/standard php_fopen_wrapper.c Log: the apache 1.x sapi read_posts tests for SG(read_post_bytes) being counted up, so lets make it happy although this value is not really needed in these cases ... Index: php4/main/SAPI.c diff -u php4/main/SAPI.c:1.156 php4/main/SAPI.c:1.157 --- php4/main/SAPI.c:1.156 Sun Nov 17 19:59:23 2002 +++ php4/main/SAPI.c Thu Nov 21 05:29:11 2002 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: SAPI.c,v 1.156 2002/11/18 00:59:23 gschlossnagle Exp $ */ +/* $Id: SAPI.c,v 1.157 2002/11/21 10:29:11 hholzgra Exp $ */ #include <ctype.h> #include <sys/stat.h> @@ -390,8 +390,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.30 --- 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:29:11 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.30 2002/11/21 10:29:11 hholzgra Exp $ */ #include <stdio.h> #include <stdlib.h> @@ -96,6 +96,7 @@ } } + SG(read_post_bytes) += read_bytes; return read_bytes; }