[PHP-CVS] cvs: php-src(PHP_5_2) /main output.c
shire Mon Apr 16 02:25:24 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/main output.c Log: fix fold typo http://cvs.php.net/viewvc.cgi/php-src/main/output.c?r1=1.167.2.3.2.2&r2=1.167.2.3.2.3&diff_format=u Index: php-src/main/output.c diff -u php-src/main/output.c:1.167.2.3.2.2 php-src/main/output.c:1.167.2.3.2.3 --- php-src/main/output.c:1.167.2.3.2.2 Mon Jan 29 11:21:31 2007 +++ php-src/main/output.c Mon Apr 16 02:25:24 2007 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: output.c,v 1.167.2.3.2.2 2007/01/29 11:21:31 dmitry Exp $ */ +/* $Id: output.c,v 1.167.2.3.2.3 2007/04/16 02:25:24 shire Exp $ */ #include "php.h" #include "ext/standard/head.h" @@ -112,7 +112,7 @@ /* }}} */ -/* {{{ php_body_wirte +/* {{{ php_body_write * Write body part */ PHPAPI int php_body_write(const char *str, uint str_length TSRMLS_DC) { @@ -120,7 +120,7 @@ } /* }}} */ -/* {{{ php_header_wirte +/* {{{ php_header_write * Write HTTP header */ PHPAPI int php_header_write(const char *str, uint str_length TSRMLS_DC) { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /main output.c
tony2001Fri Sep 21 13:08:00 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/main output.c Log: initialize all fields of the struct (it's generally good idea even though they should not be used) http://cvs.php.net/viewvc.cgi/php-src/main/output.c?r1=1.167.2.3.2.3&r2=1.167.2.3.2.4&diff_format=u Index: php-src/main/output.c diff -u php-src/main/output.c:1.167.2.3.2.3 php-src/main/output.c:1.167.2.3.2.4 --- php-src/main/output.c:1.167.2.3.2.3 Mon Apr 16 02:25:24 2007 +++ php-src/main/output.c Fri Sep 21 13:08:00 2007 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: output.c,v 1.167.2.3.2.3 2007/04/16 02:25:24 shire Exp $ */ +/* $Id: output.c,v 1.167.2.3.2.4 2007/09/21 13:08:00 tony2001 Exp $ */ #include "php.h" #include "ext/standard/head.h" @@ -430,6 +430,8 @@ tmp_buf.chunk_size = chunk_size; tmp_buf.status = 0; tmp_buf.internal_output_handler = NULL; + tmp_buf.internal_output_handler_buffer = NULL; + tmp_buf.internal_output_handler_buffer_size = 0; tmp_buf.handler_name = estrdup(handler_name&&handler_name[0]?handler_name:OB_DEFAULT_HANDLER_NAME); tmp_buf.erase = erase; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /main output.c
tony2001Mon Aug 18 07:47:04 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/main output.c Log: reverted because of test failures http://cvs.php.net/viewvc.cgi/php-src/main/output.c?r1=1.167.2.3.2.6&r2=1.167.2.3.2.7&diff_format=u Index: php-src/main/output.c diff -u php-src/main/output.c:1.167.2.3.2.6 php-src/main/output.c:1.167.2.3.2.7 --- php-src/main/output.c:1.167.2.3.2.6 Mon Aug 18 04:09:37 2008 +++ php-src/main/output.c Mon Aug 18 07:47:04 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: output.c,v 1.167.2.3.2.6 2008/08/18 04:09:37 lbarnaud Exp $ */ +/* $Id: output.c,v 1.167.2.3.2.7 2008/08/18 07:47:04 tony2001 Exp $ */ #include "php.h" #include "ext/standard/head.h" @@ -336,13 +336,7 @@ PHPAPI void php_end_ob_buffers(zend_bool send_buffer TSRMLS_DC) { while (OG(ob_nesting_level)!=0) { - /* in case of unclean_shutdown, do not output the buffer if it is not -* meant to be until end of script or ob_end_*() call */ - if (CG(unclean_shutdown) && !OG(active_ob_buffer).chunk_size) { - php_end_ob_buffer(0, 0 TSRMLS_CC); - } else { - php_end_ob_buffer(send_buffer, 0 TSRMLS_CC); - } + php_end_ob_buffer(send_buffer, 0 TSRMLS_CC); } } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php