summaryrefslogtreecommitdiff
path: root/main/main.c
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2001-07-02 18:17:10 +0000
committerZeev Suraski <zeev@php.net>2001-07-02 18:17:10 +0000
commit551f1831a7dc0ef96082a6f95f565553be590798 (patch)
tree24793ff58625dbd68364233fd5d9d687b4adcb18 /main/main.c
parent610ebfe3de1c0a1acd63bb7e20bed9a997760413 (diff)
downloadphp-git-551f1831a7dc0ef96082a6f95f565553be590798.tar.gz
Fix a major thread safety bug in the output mechanism
@- Fixed a major memory corruption bug in the thread safe version (Zeev)
Diffstat (limited to 'main/main.c')
-rw-r--r--main/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/main.c b/main/main.c
index 73d2bc9889..eecf8e1a9c 100644
--- a/main/main.c
+++ b/main/main.c
@@ -613,7 +613,7 @@ int php_request_startup(CLS_D ELS_DC PLS_DC SLS_DC)
PG(during_request_startup) = 1;
- php_output_startup();
+ php_output_activate();
/* initialize global variables */
PG(modules_activated) = 0;
@@ -829,6 +829,7 @@ int php_module_startup(sapi_module_struct *sf)
sapi_module = *sf;
php_output_startup();
+ php_output_activate();
zuf.error_function = php_error_cb;
zuf.printf_function = php_printf;