diff options
| author | Michael Wallner <mike@php.net> | 2012-11-28 10:19:44 +0100 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2012-11-28 10:19:44 +0100 |
| commit | 575790e8427ea09cb76aed16ff776461367f2a3b (patch) | |
| tree | f22f4075c8a34b70e87938d1bcc42d769866ef2f | |
| parent | d88017e992d03dc6909b1a1c120668b90f52ae39 (diff) | |
| download | php-git-575790e8427ea09cb76aed16ff776461367f2a3b.tar.gz | |
fix bug #61272 ob_start callback get passed empty string
| -rw-r--r-- | main/output.c | 2 | ||||
| -rw-r--r-- | tests/output/ob_017.phpt | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/main/output.c b/main/output.c index e100057ca9..b835bcc9b7 100644 --- a/main/output.c +++ b/main/output.c @@ -297,7 +297,6 @@ PHPAPI int php_output_clean(TSRMLS_D) php_output_context context; if (OG(active) && (OG(active)->flags & PHP_OUTPUT_HANDLER_CLEANABLE)) { - OG(active)->buffer.used = 0; php_output_context_init(&context, PHP_OUTPUT_HANDLER_CLEAN TSRMLS_CC); php_output_handler_op(OG(active), &context); php_output_context_dtor(&context); @@ -1226,7 +1225,6 @@ static inline int php_output_stack_pop(int flags TSRMLS_DC) /* signal that we're cleaning up */ if (flags & PHP_OUTPUT_POP_DISCARD) { context.op |= PHP_OUTPUT_HANDLER_CLEAN; - orphan->buffer.used = 0; } php_output_handler_op(orphan, &context); } diff --git a/tests/output/ob_017.phpt b/tests/output/ob_017.phpt index 070df603fc..517fafe991 100644 --- a/tests/output/ob_017.phpt +++ b/tests/output/ob_017.phpt @@ -27,8 +27,8 @@ Array [0] => 1: yes [1] => 4: ! - [2] => 2: + [2] => 2: no [3] => 0: yes! - [4] => 10: + [4] => 10: no ) |