Commit:    abd2b2ee4332e598f46efec0cac0a9f546bc4f2d
Author:    reeze <reeze....@gmail.com>         Thu, 29 Mar 2012 00:18:02 +0800
Committer: Yasuo Ohgaki <yohg...@ohgaki.net>      Thu, 29 Mar 2012 06:23:05 
+0900
Parents:   5ddfdb8fd4f52d49a9483792ccc37d7879b14e72
Branches:  PHP-5.3

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=abd2b2ee4332e598f46efec0cac0a9f546bc4f2d

Log:
- fix bug #61541, Segfault when using ob_* in output_callback

Bugs:
https://bugs.php.net/61541

Changed paths:
  M  main/output.c
  M  tests/output/ob_011.phpt


Diff:
abd2b2ee4332e598f46efec0cac0a9f546bc4f2d
diff --git a/main/output.c b/main/output.c
index fb589a2..5a7ed7b 100644
--- a/main/output.c
+++ b/main/output.c
@@ -225,6 +225,17 @@ PHPAPI void php_end_ob_buffer(zend_bool send_buffer, 
zend_bool just_flush TSRMLS
                zval *orig_buffer;
                zval *z_status;
 
+               if(OG(ob_lock)) {
+                       if (SG(headers_sent) && !SG(request_info).headers_only) 
{
+                               OG(php_body_write) = 
php_ub_body_write_no_header;
+                       } else {
+                               OG(php_body_write) = php_ub_body_write;
+                       }
+                       OG(ob_nesting_level) = 0;
+                       php_error_docref("ref.outcontrol" TSRMLS_CC, E_ERROR, 
"Cannot use output buffering in output buffering display handlers");
+                       return;
+               }
+
                ALLOC_INIT_ZVAL(orig_buffer);
                ZVAL_STRINGL(orig_buffer, OG(active_ob_buffer).buffer, 
OG(active_ob_buffer).text_length, 1);
 
diff --git a/tests/output/ob_011.phpt b/tests/output/ob_011.phpt
index a90fd56..35b0388 100644
--- a/tests/output/ob_011.phpt
+++ b/tests/output/ob_011.phpt
@@ -1,7 +1,5 @@
 --TEST--
 output buffering - fatalism
---XFAIL--
-This test will fail until the fix in revision r214155 is backported from php 6
 --FILE--
 <?php
 function obh($s)


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to