[PHP-CVS] cvs: php-src(PHP_4_3) /main output.c

[Ilia Alshanetsky]

iliaa           Fri Aug  8 19:44:05 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src/main       output.c 
  Log:
  MFH: Fixed bug #24951 (ob_flush() needlessly destroys output handler).
  
  
Index: php-src/main/output.c
diff -u php-src/main/output.c:1.142.2.14 php-src/main/output.c:1.142.2.15
--- php-src/main/output.c:1.142.2.14    Thu Jul 31 15:48:05 2003
+++ php-src/main/output.c       Fri Aug  8 19:44:04 2003
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: output.c,v 1.142.2.14 2003/07/31 19:48:05 iliaa Exp $ */
+/* $Id: output.c,v 1.142.2.15 2003/08/08 23:44:04 iliaa Exp $ */
 
 #include "php.h"
 #include "ext/standard/head.h"
@@ -247,7 +247,9 @@
                        }
                }
                OG(ob_lock) = 0;
-               zval_ptr_dtor(&OG(active_ob_buffer).output_handler);
+               if (!just_flush) {
+                       zval_ptr_dtor(&OG(active_ob_buffer).output_handler);
+               }
                orig_buffer->refcount -=2;
                if (orig_buffer->refcount <= 0) { /* free the zval */
                        zval_dtor(orig_buffer);



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