Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #65593 (Segfault when calling ob_start from output buffering callback)

diff --cc main/output.c
index 2991d0dba108005f0e054ef8e8a3e1147bbed545,456241f4e94e12dd1d48d18f51e690152d35ac28..64729ac4a49c23a566c5fc0a52a48f4782fd65d3
--- 1/main/output.c
--- 2/main/output.c
+++ b/main/output.c
@@@ -179,21 -172,22 +179,21 @@@ PHPAPI void php_output_deactivate(void
  {
        php_output_handler **handler = NULL;
  
-       php_output_header();
+       if ((OG(flags) & PHP_OUTPUT_ACTIVATED)) {
 -              php_output_header(TSRMLS_C);
  
-       OG(flags) ^= PHP_OUTPUT_ACTIVATED;
-       OG(active) = NULL;
-       OG(running) = NULL;
+               OG(flags) ^= PHP_OUTPUT_ACTIVATED;
+               OG(active) = NULL;
+               OG(running) = NULL;
  
-       /* release all output handlers */
-       if (OG(handlers).elements) {
-               while ((handler = zend_stack_top(&OG(handlers)))) {
-                       php_output_handler_free(handler);
-                       zend_stack_del_top(&OG(handlers));
+               /* release all output handlers */
+               if (OG(handlers).elements) {
 -                      while (SUCCESS == zend_stack_top(&OG(handlers), (void *) &handler)) {
 -                              php_output_handler_free(handler TSRMLS_CC);
++                      while ((handler = zend_stack_top(&OG(handlers)))) {
++                              php_output_handler_free(handler);
+                               zend_stack_del_top(&OG(handlers));
+                       }
 -                      zend_stack_destroy(&OG(handlers));
                }
 +              zend_stack_destroy(&OG(handlers));
        }
- 
  }
  /* }}} */