cvs: php4 /ext/standard basic_functions.c output.c php_output.h

andi Wed May 23 09:52:46 2001 EDT Modified files: /php4/ext/standard basic_functions.c output.c php_output.h Log: - Fix problem of output initialization Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.347 php4/ext/standard/basic_functions.c:1.348 --- php4/ext/standard/basic_functions.c:1.347 Tue May 22 20:37:53 2001 +++ php4/ext/standard/basic_functions.c Wed May 23 09:52:45 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.347 2001/05/23 03:37:53 sterling Exp $ */ +/* $Id: basic_functions.c,v 1.348 2001/05/23 16:52:45 andi Exp $ */ #include "php.h" #include "php_main.h" @@ -751,7 +751,6 @@ register_html_constants(INIT_FUNC_ARGS_PASSTHRU); register_string_constants(INIT_FUNC_ARGS_PASSTHRU); - PHP_MINIT(output)(INIT_FUNC_ARGS_PASSTHRU); PHP_MINIT(regex)(INIT_FUNC_ARGS_PASSTHRU); PHP_MINIT(file)(INIT_FUNC_ARGS_PASSTHRU); PHP_MINIT(pack)(INIT_FUNC_ARGS_PASSTHRU); Index: php4/ext/standard/output.c diff -u php4/ext/standard/output.c:1.55 php4/ext/standard/output.c:1.56 --- php4/ext/standard/output.c:1.55 Tue May 22 12:19:04 2001 +++ php4/ext/standard/output.c Wed May 23 09:52:45 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: output.c,v 1.55 2001/05/22 19:19:04 andi Exp $ */ +/* $Id: output.c,v 1.56 2001/05/23 16:52:45 andi Exp $ */ #include "php.h" #include "ext/standard/head.h" @@ -59,26 +59,23 @@ } -PHP_MINIT_FUNCTION(output) +/* Start output layer */ +PHPAPI void php_output_startup() { #ifdef ZTS output_globals_id = ts_allocate_id(sizeof(php_output_globals), (ts_allocate_ctor) php_output_init_globals, NULL); #else php_output_init_globals(OLS_C); #endif - - return SUCCESS; -} -/* Start output layer */ -PHPAPI void php_output_startup() -{ - OLS_FETCH(); + { + OLS_FETCH(); - OG(php_body_write) = php_ub_body_write; - OG(php_header_write) = sapi_module.ub_write; - OG(nesting_level) = 0; - OG(lock) = 0; + OG(php_body_write) = php_ub_body_write; + OG(php_header_write) = sapi_module.ub_write; + OG(nesting_level) = 0; + OG(lock) = 0; + } } Index: php4/ext/standard/php_output.h diff -u php4/ext/standard/php_output.h:1.24 php4/ext/standard/php_output.h:1.25 --- php4/ext/standard/php_output.h:1.24 Tue May 22 12:19:04 2001 +++ php4/ext/standard/php_output.h Wed May 23 09:52:45 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_output.h,v 1.24 2001/05/22 19:19:04 andi Exp $ */ +/* $Id: php_output.h,v 1.25 2001/05/23 16:52:45 andi Exp $ */ #ifndef PHP_OUTPUT_H #define PHP_OUTPUT_H @@ -46,8 +46,6 @@ PHP_FUNCTION(ob_get_contents); PHP_FUNCTION(ob_get_length); PHP_FUNCTION(ob_implicit_flush); - -PHP_MINIT_FUNCTION(output); typedef struct _php_ob_buffer { char *buffer;