cvs: /php4 main.c /php4/ext/standard output.c

zeev Mon Nov 22 15:59:27 1999 EDT Modified files: /php4 main.c /php4/ext/standard output.c Log: Fixed a leak when using automatic output buffering Index: php4/main.c diff -u php4/main.c:1.135 php4/main.c:1.136 --- php4/main.c:1.135 Wed Nov 17 17:58:29 1999 +++ php4/main.c Mon Nov 22 15:58:55 1999 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.135 1999/11/17 22:58:29 sas Exp $ */ +/* $Id: main.c,v 1.136 1999/11/22 20:58:55 zeev Exp $ */ #include <stdio.h> @@ -710,9 +710,6 @@ 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 @@ -739,6 +736,10 @@ 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; Index: php4/ext/standard/output.c diff -u php4/ext/standard/output.c:1.1 php4/ext/standard/output.c:1.2 --- php4/ext/standard/output.c:1.1 Wed Oct 27 14:30:41 1999 +++ php4/ext/standard/output.c Mon Nov 22 15:58:56 1999 @@ -119,6 +119,7 @@ STANDARD_MODULE_PROPERTIES }; + PHP_RINIT_FUNCTION(output) { php_output_startup();