2 files changed, 8 insertions, 1 deletions
diff --git a/ext/standard/output.c b/ext/standard/output.c
index e484ea777c..1b4a656981 100644
--- a/ext/standard/output.c
+++ b/ext/standard/output.c
@@ -68,18 +68,24 @@ PHP_GINIT_FUNCTION(output)
 PHPAPI void php_output_startup()
 {
 	OLS_FETCH();
-	ELS_FETCH();
 
 	OG(php_body_write) = php_ub_body_write;
 	OG(php_header_write) = sapi_module.ub_write;
 	OG(nesting_level) = 0;
 	OG(lock) = 0;
+}
+
+
+void php_output_register_constants()
+{
+	ELS_FETCH();
 
 	REGISTER_MAIN_LONG_CONSTANT("PHP_OUTPUT_HANDLER_START", PHP_OUTPUT_HANDLER_START, CONST_CS | CONST_PERSISTENT);
 	REGISTER_MAIN_LONG_CONSTANT("PHP_OUTPUT_HANDLER_CONT", PHP_OUTPUT_HANDLER_CONT, CONST_CS | CONST_PERSISTENT);
 	REGISTER_MAIN_LONG_CONSTANT("PHP_OUTPUT_HANDLER_END", PHP_OUTPUT_HANDLER_END, CONST_CS | CONST_PERSISTENT);
 }
 
+
 PHPAPI int php_body_write(const char *str, uint str_length)
 {
 	OLS_FETCH();
diff --git a/ext/standard/php_output.h b/ext/standard/php_output.h
index d7d617ba12..1792d20257 100644
--- a/ext/standard/php_output.h
+++ b/ext/standard/php_output.h
@@ -24,6 +24,7 @@
 #include "php.h"
 
 PHPAPI void php_output_startup(void);
+void php_output_register_constants(void);
 PHPAPI int  php_body_write(const char *str, uint str_length);
 PHPAPI int  php_header_write(const char *str, uint str_length);
 PHPAPI int php_start_ob_buffer(zval *output_handler, uint chunk_size);