pierrick                                 Fri, 18 Nov 2011 00:16:58 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=319428

Log:
Fixed bug #60321 (ob_get_status(true) no longer returns an array when buffer is 
empty).

Bug: https://bugs.php.net/60321 (Open) ob_get_status(true) no longer returns an 
array when buffer is empty
      
Changed paths:
    U   php/php-src/branches/PHP_5_4/NEWS
    U   php/php-src/branches/PHP_5_4/main/output.c
    A   php/php-src/branches/PHP_5_4/tests/output/bug60321.phpt
    U   php/php-src/trunk/main/output.c
    A   php/php-src/trunk/tests/output/bug60321.phpt

Modified: php/php-src/branches/PHP_5_4/NEWS
===================================================================
--- php/php-src/branches/PHP_5_4/NEWS   2011-11-17 22:26:03 UTC (rev 319427)
+++ php/php-src/branches/PHP_5_4/NEWS   2011-11-18 00:16:58 UTC (rev 319428)
@@ -24,6 +24,8 @@
     (Chris Jones)

 - Output:
+  . Fixed bug #60321 (ob_get_status(true) no longer returns an array when
+    buffer is empty). (Pierrick)
   . Fixed bug #60282 (Segfault when using ob_gzhandler() with open buffers).
     (Laruence)


Modified: php/php-src/branches/PHP_5_4/main/output.c
===================================================================
--- php/php-src/branches/PHP_5_4/main/output.c  2011-11-17 22:26:03 UTC (rev 
319427)
+++ php/php-src/branches/PHP_5_4/main/output.c  2011-11-18 00:16:58 UTC (rev 
319428)
@@ -1439,12 +1439,12 @@
                return;
        }

+       array_init(return_value);
+
        if (!OG(active)) {
-               RETURN_FALSE;
+               return;
        }

-       array_init(return_value);
-
        if (full_status) {
                zend_stack_apply_with_argument(&OG(handlers), 
ZEND_STACK_APPLY_BOTTOMUP, php_output_stack_apply_status, return_value);
        } else {

Added: php/php-src/branches/PHP_5_4/tests/output/bug60321.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/tests/output/bug60321.phpt                     
        (rev 0)
+++ php/php-src/branches/PHP_5_4/tests/output/bug60321.phpt     2011-11-18 
00:16:58 UTC (rev 319428)
@@ -0,0 +1,9 @@
+--TEST--
+Bug #60321 (ob_get_status(true) no longer returns an array when buffer is 
empty)
+--FILE--
+<?php
+$return = ob_get_status(true);
+var_dump($return);
+--EXPECT--
+array(0) {
+}

Modified: php/php-src/trunk/main/output.c
===================================================================
--- php/php-src/trunk/main/output.c     2011-11-17 22:26:03 UTC (rev 319427)
+++ php/php-src/trunk/main/output.c     2011-11-18 00:16:58 UTC (rev 319428)
@@ -1438,13 +1438,13 @@
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", 
&full_status) == FAILURE) {
                return;
        }
+
+       array_init(return_value);

        if (!OG(active)) {
-               RETURN_FALSE;
+               return;
        }

-       array_init(return_value);
-
        if (full_status) {
                zend_stack_apply_with_argument(&OG(handlers), 
ZEND_STACK_APPLY_BOTTOMUP, php_output_stack_apply_status, return_value);
        } else {

Added: php/php-src/trunk/tests/output/bug60321.phpt
===================================================================
--- php/php-src/trunk/tests/output/bug60321.phpt                                
(rev 0)
+++ php/php-src/trunk/tests/output/bug60321.phpt        2011-11-18 00:16:58 UTC 
(rev 319428)
@@ -0,0 +1,9 @@
+--TEST--
+Bug #60321 (ob_get_status(true) no longer returns an array when buffer is 
empty)
+--FILE--
+<?php
+$return = ob_get_status(true);
+var_dump($return);
+--EXPECT--
+array(0) {
+}

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

Reply via email to