diff options
author | Michael Wallner <mike@php.net> | 2010-05-31 10:29:43 +0000 |
---|---|---|
committer | Michael Wallner <mike@php.net> | 2010-05-31 10:29:43 +0000 |
commit | 11d24c1593d6617f73d3f290617bd8994182f4dc (patch) | |
tree | eddeffa97ad3893b731144afb003e26ef0952de9 /sapi/apache | |
parent | 27299b7e4084adb236acfbfb25168d72306ee802 (diff) | |
download | php-git-11d24c1593d6617f73d3f290617bd8994182f4dc.tar.gz |
* implement new output API, fixing some bugs and implementing some feature
requests--let's see what I can dig out of the bugtracker for NEWS--
and while crossing the road:
* implemented new zlib API
* fixed up ext/tidy (what was "s&" in zend_parse_parameters() supposed to do?)
Thanks to Jani and Felipe for pioneering.
Diffstat (limited to 'sapi/apache')
-rw-r--r-- | sapi/apache/mod_php5.c | 2 | ||||
-rw-r--r-- | sapi/apache/php_apache.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sapi/apache/mod_php5.c b/sapi/apache/mod_php5.c index 25b5ef77cd..2b64270b99 100644 --- a/sapi/apache/mod_php5.c +++ b/sapi/apache/mod_php5.c @@ -329,7 +329,7 @@ static void php_apache_request_shutdown(void *dummy) { TSRMLS_FETCH(); - php_output_set_status(0 TSRMLS_CC); + php_output_set_status(PHP_OUTPUT_DISABLED TSRMLS_CC); if (AP(in_request)) { AP(in_request) = 0; php_request_shutdown(dummy); diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c index 2eb9277354..57d6f3b2d6 100644 --- a/sapi/apache/php_apache.c +++ b/sapi/apache/php_apache.c @@ -368,7 +368,7 @@ PHP_FUNCTION(virtual) RETURN_FALSE; } - php_end_ob_buffers(1 TSRMLS_CC); + php_output_end_all(TSRMLS_C); php_header(TSRMLS_C); if (run_sub_req(rr)) { |