cvs: php4 /ext/standard output.c
| From: | Anil Madhavapeddy | Date: | Mon, 02 Apr 2001 16:45:27 +0000 |
| Subject: | cvs: php4 /ext/standard output.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-4949@lists.php.net to get a copy of this message | ||
avsm Mon Apr 2 09:45:27 2001 EDT
Modified files:
/php4/ext/standard output.c
Log:
Free the correct output buffer, to avoid a segfault on a HEAD request
when using output buffering with a custom handler (patch by zeev@)
Index: php4/ext/standard/output.c
diff -u php4/ext/standard/output.c:1.52 php4/ext/standard/output.c:1.53
--- php4/ext/standard/output.c:1.52 Sat Mar 31 14:53:19 2001
+++ php4/ext/standard/output.c Mon Apr 2 09:45:27 2001
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: output.c,v 1.52 2001/03/31 22:53:19 zeev Exp $ */
+/* $Id: output.c,v 1.53 2001/04/02 16:45:27 avsm Exp $ */
#include "php.h"
#include "ext/standard/head.h"
@@ -214,6 +214,7 @@
zend_stack_destroy(&OG(ob_buffers));
}
}
+ OG(nesting_level)--;
}
if (send_buffer) {
@@ -226,8 +227,6 @@
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;