diff options
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 6d74ca6890..5deb7bba4b 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -154,9 +154,10 @@ static void print_hash(zend_write_func_t write_func, HashTable *ht, int indent, case HASH_KEY_IS_STRING: if (is_object) { const char *prop_name, *class_name; - int mangled = zend_unmangle_property_name(string_key, str_len - 1, &class_name, &prop_name); + int prop_len; + int mangled = zend_unmangle_property_name_ex(string_key, str_len - 1, &class_name, &prop_name, &prop_len); - ZEND_PUTS_EX(prop_name); + ZEND_WRITE_EX(prop_name, prop_len); if (class_name && mangled == SUCCESS) { if (class_name[0]=='*') { ZEND_PUTS_EX(":protected"); @@ -679,11 +680,11 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions TS #if HAVE_DTRACE /* build with dtrace support */ zend_compile_file = dtrace_compile_file; - zend_execute = dtrace_execute; + zend_execute_ex = dtrace_execute_ex; zend_execute_internal = dtrace_execute_internal; #else zend_compile_file = compile_file; - zend_execute = execute; + zend_execute_ex = execute_ex; zend_execute_internal = NULL; #endif /* HAVE_SYS_SDT_H */ zend_compile_string = compile_string; @@ -809,9 +810,6 @@ void zend_shutdown(TSRMLS_D) /* {{{ */ #ifdef ZEND_SIGNALS zend_signal_shutdown(TSRMLS_C); #endif -#ifdef ZEND_WIN32 - zend_shutdown_timeout_thread(); -#endif zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC); if (EG(active)) |