Fixed a leak when using automatic output buffering

@ Fixed a leak when using automatic output buffering (Zeev)

diff --git a/ext/standard/output.c b/ext/standard/output.c
index e1c0226afd30283ac93803f5f4206117e28a509c..0eecddb40f7e26d19c87139b55b39877263f2db9 100644 (file)
--- a/ext/standard/output.c
+++ b/ext/standard/output.c
@@ -119,6 +119,7 @@ php3_module_entry output_module_entry = {
        STANDARD_MODULE_PROPERTIES
 };
 
+
 PHP_RINIT_FUNCTION(output)
 {
        php_output_startup();

diff --git a/main/main.c b/main/main.c
index 249390136abf5f535cea543b2b6a52b0adf1b6cc..c79a97389e52843484c21dc255430b38085afb2d 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -710,9 +710,6 @@ int php_request_startup(CLS_D ELS_DC PLS_DC SLS_DC)
        php_output_startup();
        php_init_post_request_startup(PLS_C);
 
-       if (PG(output_buffering)) {
-               php_start_ob_buffering();
-       }
 #if APACHE
        /*
         * For the Apache module version, this bit of code registers a cleanup
@@ -740,6 +737,10 @@ int php_request_startup(CLS_D ELS_DC PLS_DC SLS_DC)
        zend_activate(CLS_C ELS_CC);
        sapi_activate(SLS_C);   
 
+       if (PG(output_buffering)) {
+               php_start_ob_buffering();
+       }
+
        if (SG(request_info).auth_user) {
                zval *auth_user;
 

diff --git a/main/output.c b/main/output.c
index e1c0226afd30283ac93803f5f4206117e28a509c..0eecddb40f7e26d19c87139b55b39877263f2db9 100644 (file)
--- a/main/output.c
+++ b/main/output.c
@@ -119,6 +119,7 @@ php3_module_entry output_module_entry = {
        STANDARD_MODULE_PROPERTIES
 };
 
+
 PHP_RINIT_FUNCTION(output)
 {
        php_output_startup();