From 4ce0141713bfc14bfab06aaa9525b7d6a3339438 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Fri, 2 Jun 2006 19:51:43 +0000 Subject: - new output control code # scan README.NEW-OUTPUT-API to get a grasp # tree has been tagged with BEFORE_NEW_OUTPUT_API # # TODO: # - improve existing output handlers # - move zlib.output_compression cruft from SAPI.c to zlib.c # - output_encoding handling was ambigious, resp. is undefined yet # - more tests --- sapi/apache_hooks/mod_php5.c | 2 +- sapi/apache_hooks/php_apache.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sapi/apache_hooks') diff --git a/sapi/apache_hooks/mod_php5.c b/sapi/apache_hooks/mod_php5.c index c23dfc1d5c..558274d5da 100644 --- a/sapi/apache_hooks/mod_php5.c +++ b/sapi/apache_hooks/mod_php5.c @@ -434,7 +434,7 @@ static void php_apache_request_shutdown(void *dummy) { TSRMLS_FETCH(); AP(current_hook) = AP_CLEANUP; - php_output_set_status(0 TSRMLS_CC); + php_output_set_status(PHP_OUTPUT_DISABLED); SG(server_context) = NULL; /* The server context (request) is invalid by the time run_cleanups() is called */ if(SG(sapi_started)) { php_request_shutdown(dummy); diff --git a/sapi/apache_hooks/php_apache.c b/sapi/apache_hooks/php_apache.c index 0e9fc4d5f7..da68b57225 100644 --- a/sapi/apache_hooks/php_apache.c +++ b/sapi/apache_hooks/php_apache.c @@ -1731,7 +1731,7 @@ PHP_FUNCTION(virtual) RETURN_FALSE; } - php_end_ob_buffers(1 TSRMLS_CC); + php_output_end_all(); php_header(TSRMLS_C); if (run_sub_req(rr)) { -- cgit v1.2.1