From 31632b3458da1b09fd481a7d3ccdf142a47edb2e Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Tue, 22 Aug 2006 08:21:19 +0000 Subject: [PATCH] - use the handler name zval directly when listing stati, too --- main/output.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/main/output.c b/main/output.c index 9dddb64583..e0f5dede92 100644 --- a/main/output.c +++ b/main/output.c @@ -1159,11 +1159,8 @@ static inline zval *php_output_handler_status(php_output_handler *handler, zval array_init(entry); } - if (Z_TYPE_P(handler->name) == IS_UNICODE) { - add_assoc_unicodel(entry, "name", Z_USTRVAL_P(handler->name), Z_USTRLEN_P(handler->name), 1); - } else { - add_assoc_stringl(entry, "name", Z_STRVAL_P(handler->name), Z_STRLEN_P(handler->name), 1); - } + ZVAL_ADDREF(handler->name); + add_assoc_zval(entry, "name", handler->name); add_assoc_long(entry, "type", (long) (handler->flags & 0xf)); add_assoc_long(entry, "flags", (long) handler->flags); add_assoc_long(entry, "level", (long) handler->level); -- 2.50.1