summaryrefslogtreecommitdiff
path: root/main/php_output.h
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2001-07-20 13:59:00 +0000
committerZeev Suraski <zeev@php.net>2001-07-20 13:59:00 +0000
commit13ac04b8e504ba5b0d531bee43d602e6980e2e20 (patch)
tree8f91eea07029b467713f840d87023f907d9f8f37 /main/php_output.h
parentcd3acbd78554a94725ad3f7a82bb1a2d6c4f61d8 (diff)
downloadphp-git-13ac04b8e504ba5b0d531bee43d602e6980e2e20.tar.gz
Avoid getting bailouts on text output during shutdown. Text output is now
'officially' disabled during shutdown (this doesn't change the Apache module behavior, but may change behavior of other server modules, in which it was possible to emit output during shutdown; I think it's a good step towards consistency, though)
Diffstat (limited to 'main/php_output.h')
-rw-r--r--main/php_output.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/main/php_output.h b/main/php_output.h
index 2d06f5ce34..45d8c404a1 100644
--- a/main/php_output.h
+++ b/main/php_output.h
@@ -27,6 +27,7 @@ typedef void (*php_output_handler_func_t)(char *output, uint output_len, char **
PHPAPI void php_output_startup(void);
PHPAPI void php_output_activate(void);
+PHPAPI void php_output_set_status(zend_bool status);
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);
@@ -69,8 +70,9 @@ typedef struct _php_output_globals {
char *output_start_filename;
int output_start_lineno;
zend_stack ob_buffers;
- int nesting_level;
- zend_bool lock;
+ int ob_nesting_level;
+ zend_bool ob_lock;
+ zend_bool disable_output;
} php_output_globals;