tony2001 Thu Nov 17 07:03:00 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/main output.c
Log:
fix #35257 in a smarter way
http://cvs.php.net/diff.php/php-src/main/output.c?r1=1.142.2.16.2.2&r2=1.142.2.16.2.3&ty=u
Index: php-src/main/output.c
diff -u php-src/main/output.c:1.142.2.16.2.2
php-src/main/output.c:1.142.2.16.2.3
--- php-src/main/output.c:1.142.2.16.2.2 Thu Nov 17 06:42:40 2005
+++ php-src/main/output.c Thu Nov 17 07:02:57 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: output.c,v 1.142.2.16.2.2 2005/11/17 11:42:40 tony2001 Exp $ */
+/* $Id: output.c,v 1.142.2.16.2.3 2005/11/17 12:02:57 tony2001 Exp $ */
#include "php.h"
#include "ext/standard/head.h"
@@ -296,7 +296,7 @@
OG(ob_nesting_level)--;
if (send_buffer) {
- if (just_flush && strlen(final_buffer)) { /* if flush is called
prior to proper end, ensure presence of NUL */
+ if (just_flush && final_buffer[0] != '\0') { /* 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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
