mirror of
https://github.com/php/php-src.git
synced 2026-04-02 13:43:02 +02:00
Fixed a leak when using automatic output buffering
@ Fixed a leak when using automatic output buffering (Zeev)
This commit is contained in:
@@ -119,6 +119,7 @@ php3_module_entry output_module_entry = {
|
||||
STANDARD_MODULE_PROPERTIES
|
||||
};
|
||||
|
||||
|
||||
PHP_RINIT_FUNCTION(output)
|
||||
{
|
||||
php_output_startup();
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -119,6 +119,7 @@ php3_module_entry output_module_entry = {
|
||||
STANDARD_MODULE_PROPERTIES
|
||||
};
|
||||
|
||||
|
||||
PHP_RINIT_FUNCTION(output)
|
||||
{
|
||||
php_output_startup();
|
||||
|
||||
Reference in New Issue
Block a user