cvs: php-src(PHP_5_1) /main output.c

iliaa Wed Aug 24 12:19:57 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/main output.c Log: MFH: Remainder of the 34191 bug fix. http://cvs.php.net/diff.php/php-src/main/output.c?r1=1.167&r2=1.167.2.1&ty=u Index: php-src/main/output.c diff -u php-src/main/output.c:1.167 php-src/main/output.c:1.167.2.1 --- php-src/main/output.c:1.167 Wed Aug 3 10:08:32 2005 +++ php-src/main/output.c Wed Aug 24 12:19:57 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: output.c,v 1.167 2005/08/03 14:08:32 sniper Exp $ */ +/* $Id: output.c,v 1.167.2.1 2005/08/24 16:19:57 iliaa Exp $ */ #include "php.h" #include "ext/standard/head.h" @@ -294,6 +294,9 @@ OG(ob_nesting_level)--; if (send_buffer) { + if (just_flush) { /* if flush is called prior to proper end, ensure presence of NUL */ + final_buffer[final_buffer_length] = '\0'; + } OG(php_body_write)(final_buffer, final_buffer_length TSRMLS_CC); }