php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 11:13:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Fix problem of output initialization

Browse Source
This commit is contained in:
Andi Gutmans
2001-05-23 16:52:45 +00:00
parent c96d652843
commit 4ddb24366f
5 changed files with 18 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/standard/basic_functions.c
-1
View File
@@ -751,7 +751,6 @@ PHP_MINIT_FUNCTION(basic)
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);
ext/standard/output.c
+9 -12
View File
@@ -59,7 +59,8 @@ static void php_output_init_globals(OLS_D)
}
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);
@@ -67,18 +68,14 @@ PHP_MINIT_FUNCTION(output)
php_output_init_globals(OLS_C);
#endif
return SUCCESS;
}
{
OLS_FETCH();
/* Start output layer */
PHPAPI void php_output_startup()
{
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;
}
}
ext/standard/php_output.h
-2
View File
@@ -47,8 +47,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;
uint size;
main/output.c
+9 -12
View File
@@ -59,7 +59,8 @@ static void php_output_init_globals(OLS_D)
}
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);
@@ -67,18 +68,14 @@ PHP_MINIT_FUNCTION(output)
php_output_init_globals(OLS_C);
#endif
return SUCCESS;
}
{
OLS_FETCH();
/* Start output layer */
PHPAPI void php_output_startup()
{
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;
}
}
main/php_output.h
-2
View File
@@ -47,8 +47,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;
uint size;