summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnil Madhavapeddy <avsm@php.net>2001-04-02 16:48:29 +0000
committerAnil Madhavapeddy <avsm@php.net>2001-04-02 16:48:29 +0000
commitaf08d51f24983e03f68a8a15bbc9609a57223ed5 (patch)
tree144c6a4d0bfdc88c6dc333d160d3c519268c0b95
parentc1af6dec32ad704abc4d781b443954b1ac6aa1d5 (diff)
downloadphp-git-af08d51f24983e03f68a8a15bbc9609a57223ed5.tar.gz
MFH, rev 1.53
-rw-r--r--ext/standard/output.c3
-rw-r--r--main/output.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/ext/standard/output.c b/ext/standard/output.c
index 49199d6a8e..ea342ae4f3 100644
--- a/ext/standard/output.c
+++ b/ext/standard/output.c
@@ -214,6 +214,7 @@ PHPAPI void php_end_ob_buffer(zend_bool send_buffer, zend_bool just_flush)
zend_stack_destroy(&OG(ob_buffers));
}
}
+ OG(nesting_level)--;
}
if (send_buffer) {
@@ -226,8 +227,6 @@ PHPAPI void php_end_ob_buffer(zend_bool send_buffer, zend_bool just_flush)
if (!just_flush) {
efree(to_be_destroyed_buffer);
-
- OG(nesting_level)--;
} else {
OG(active_ob_buffer).text_length = 0;
OG(active_ob_buffer).status |= PHP_OUTPUT_HANDLER_START;
diff --git a/main/output.c b/main/output.c
index 49199d6a8e..ea342ae4f3 100644
--- a/main/output.c
+++ b/main/output.c
@@ -214,6 +214,7 @@ PHPAPI void php_end_ob_buffer(zend_bool send_buffer, zend_bool just_flush)
zend_stack_destroy(&OG(ob_buffers));
}
}
+ OG(nesting_level)--;
}
if (send_buffer) {
@@ -226,8 +227,6 @@ PHPAPI void php_end_ob_buffer(zend_bool send_buffer, zend_bool just_flush)
if (!just_flush) {
efree(to_be_destroyed_buffer);
-
- OG(nesting_level)--;
} else {
OG(active_ob_buffer).text_length = 0;
OG(active_ob_buffer).status |= PHP_OUTPUT_HANDLER_START;