Begin the cleanup - remove ob_flush_all()

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 2576b8e91ee327e0fe33f7ea06652503c696133f..d95bb67777572c7a021d5b719690dbb8fb710d31 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -747,7 +747,6 @@ function_entry basic_functions[] = {
        /* functions from output.c */
        PHP_FE(ob_start,                                                                                                                NULL)
        PHP_FE(ob_flush,                                                                                                                NULL)
-       PHP_FE(ob_flush_all,                                                                                                    NULL)
        PHP_FE(ob_clean,                                                                                                                NULL)
        PHP_FE(ob_end_flush,                                                                                                    NULL)
        PHP_FE(ob_end_clean,                                                                                                    NULL)

diff --git a/main/output.c b/main/output.c
index 47f63edf0099bbfcf37b04cbe75ff65c48bac596..2b72c7cbbe30890257a489346e9fd013cac82613 100644 (file)
--- a/main/output.c
+++ b/main/output.c
@@ -752,28 +752,6 @@ PHP_FUNCTION(ob_flush)
 }
 /* }}} */
 
-/* {{{ proto bool ob_flush_all(void)
-   Flush (send) contents of output buffers. All buffered contents will be written/sent */
-PHP_FUNCTION(ob_flush_all)
-{
-       int orig;
-       
-       if (ZEND_NUM_ARGS() != 0)
-                       WRONG_PARAM_COUNT;
-
-       if (!OG(ob_nesting_level)) {
-               php_error_docref("ref.outcontrol" TSRMLS_CC, E_NOTICE, "failed to flush buffer. No buffer to flush.");
-               RETURN_FALSE;
-       }
-
-       orig = OG(implicit_flush); /* save current implicit flush state */
-       php_start_implicit_flush(TSRMLS_C);
-       php_end_ob_buffer(1, 1 TSRMLS_CC);
-       OG(implicit_flush) = orig;
-       
-       RETURN_TRUE;
-}
-/* }}} */
 
 /* {{{ proto bool ob_clean(void)
    Clean (delete) the current output buffer */

diff --git a/main/php_output.h b/main/php_output.h
index 4d0f7f0697f1cc73bacc8c6bda509aa817b34035..67d16a1741b1f934ea1c7deea6baa7a86b06d335 100644 (file)
--- a/main/php_output.h
+++ b/main/php_output.h
@@ -47,7 +47,6 @@ PHPAPI int php_ob_get_length(zval *p TSRMLS_DC);
 
 PHP_FUNCTION(ob_start);
 PHP_FUNCTION(ob_flush);
-PHP_FUNCTION(ob_flush_all);
 PHP_FUNCTION(ob_clean);
 PHP_FUNCTION(ob_end_flush);
 PHP_FUNCTION(ob_end_clean);