From ff11c36dc52582bae26e4572cce285b088db1ea6 Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Mon, 7 May 2001 22:00:13 +0000 Subject: [PATCH] Avoid crashing if somehow, output is sent in a new thread tha had no requests --- ext/standard/output.c | 10 ++++++++-- main/output.c | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ext/standard/output.c b/ext/standard/output.c index aa2b434450..d5862ad5a7 100644 --- a/ext/standard/output.c +++ b/ext/standard/output.c @@ -43,10 +43,16 @@ int output_globals_id; php_output_globals output_globals; #endif +static php_default_output_func(const char *str, uint str_len) +{ + fwrite(str, 1, str_len, stderr); +} + + static void php_output_init_globals(OLS_D) { - OG(php_body_write) = NULL; - OG(php_header_write) = NULL; + OG(php_body_write) = php_default_output_func; + OG(php_header_write) = php_default_output_func; OG(implicit_flush) = 0; OG(output_start_filename) = NULL; OG(output_start_lineno) = 0; diff --git a/main/output.c b/main/output.c index aa2b434450..d5862ad5a7 100644 --- a/main/output.c +++ b/main/output.c @@ -43,10 +43,16 @@ int output_globals_id; php_output_globals output_globals; #endif +static php_default_output_func(const char *str, uint str_len) +{ + fwrite(str, 1, str_len, stderr); +} + + static void php_output_init_globals(OLS_D) { - OG(php_body_write) = NULL; - OG(php_header_write) = NULL; + OG(php_body_write) = php_default_output_func; + OG(php_header_write) = php_default_output_func; OG(implicit_flush) = 0; OG(output_start_filename) = NULL; OG(output_start_lineno) = 0; -- 2.50.1