mike Tue Aug 22 08:21:19 2006 UTC
Modified files:
/php-src/main output.c
Log:
- use the handler name zval directly when listing stati, too
http://cvs.php.net/viewvc.cgi/php-src/main/output.c?r1=1.189&r2=1.190&diff_format=u
Index: php-src/main/output.c
diff -u php-src/main/output.c:1.189 php-src/main/output.c:1.190
--- php-src/main/output.c:1.189 Tue Aug 22 08:16:37 2006
+++ php-src/main/output.c Tue Aug 22 08:21:19 2006
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: output.c,v 1.189 2006/08/22 08:16:37 mike Exp $ */
+/* $Id: output.c,v 1.190 2006/08/22 08:21:19 mike Exp $ */
#ifndef PHP_OUTPUT_DEBUG
# define PHP_OUTPUT_DEBUG 0
@@ -1159,11 +1159,8 @@
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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
