From: Dmitry Stogov <dmitry@php.net>
Date: Fri, 19 Aug 2005 11:56:03 +0000 (+0000)
Subject: Unicode support
X-Git-Tag: PRE_NEW_OCI8_EXTENSION~146
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0475054c7c9dd290f11cea5435516ba08b10186e;p=php

Unicode support
---

diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index e913289d85..992c1adeb4 100644
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -391,7 +391,16 @@ static int _build_trace_args(zval **arg, int num_args, va_list args, zend_hash_k
 
 			dup = zend_get_object_classname(*arg, &class_name, &class_name_len TSRMLS_CC);
 
-			TRACE_APPEND_STRL(class_name, class_name_len);
+			if (UG(unicode)) {
+				zval tmp;
+
+				ZVAL_UNICODEL(&tmp, class_name, class_name_len, 1);
+				convert_to_string_with_converter(&tmp, ZEND_U_CONVERTER(UG(output_encoding_conv)));
+				TRACE_APPEND_STRL(Z_STRVAL(tmp), Z_STRLEN(tmp));
+				zval_dtor(&tmp);
+			} else {
+				TRACE_APPEND_STRL(class_name, class_name_len);
+			}
 			if(!dup) {
 				efree(class_name);
 			}