zeev Sun Oct 6 05:06:24 2002 EDT
Modified files:
/php4/ext/standard basic_functions.c
/php4/main output.c php_output.h
Log:
Begin the cleanup - remove ob_flush_all()
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.523
php4/ext/standard/basic_functions.c:1.524
--- php4/ext/standard/basic_functions.c:1.523 Fri Oct 4 13:17:01 2002
+++ php4/ext/standard/basic_functions.c Sun Oct 6 05:06:24 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.523 2002/10/04 17:17:01 helly Exp $ */
+/* $Id: basic_functions.c,v 1.524 2002/10/06 09:06:24 zeev Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -747,7 +747,6 @@
/* 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)
Index: php4/main/output.c
diff -u php4/main/output.c:1.139 php4/main/output.c:1.140
--- php4/main/output.c:1.139 Fri Oct 4 13:11:35 2002
+++ php4/main/output.c Sun Oct 6 05:06:24 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: output.c,v 1.139 2002/10/04 17:11:35 helly Exp $ */
+/* $Id: output.c,v 1.140 2002/10/06 09:06:24 zeev Exp $ */
#include "php.h"
#include "ext/standard/head.h"
@@ -752,28 +752,6 @@
}
/* }}} */
-/* {{{ 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 */
Index: php4/main/php_output.h
diff -u php4/main/php_output.h:1.46 php4/main/php_output.h:1.47
--- php4/main/php_output.h:1.46 Thu Oct 3 03:17:14 2002
+++ php4/main/php_output.h Sun Oct 6 05:06:24 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_output.h,v 1.46 2002/10/03 07:17:14 yohgaki Exp $ */
+/* $Id: php_output.h,v 1.47 2002/10/06 09:06:24 zeev Exp $ */
#ifndef PHP_OUTPUT_H
#define PHP_OUTPUT_H
@@ -47,7 +47,6 @@
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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
