diff options
| author | Anatol Belski <ab@php.net> | 2014-10-06 18:36:26 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-06 18:36:26 +0200 |
| commit | bd9f17846df5ca7c7f606e4392f02861523b7cd5 (patch) | |
| tree | 280d445b62fb1a0d5655facdeb554184e665d3fc /Zend/zend.c | |
| parent | 60f0695a0982c556c826191d28c8ba3a72fd2a2b (diff) | |
| parent | 5d7ccb758b407d1ba6bc7502b22ebb7cfcd2912c (diff) | |
| download | php-git-bd9f17846df5ca7c7f606e4392f02861523b7cd5.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
bring back the correct php_version.h
fix the empty_strings SAPI shutdown leak in TS build
Use fastcall calling convention for heap functions
fix leaking the empty_string in TS builds
remove successive assignment
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 253c8515ed..36f8589409 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -445,10 +445,7 @@ static void compiler_globals_ctor(zend_compiler_globals *compiler_globals TSRMLS compiler_globals->script_encoding_list = NULL; #ifdef ZTS - compiler_globals->empty_string = zend_string_alloc(sizeof("")-1, 1); - compiler_globals->empty_string->val[0] = '\000'; - zend_string_hash_val(compiler_globals->empty_string); - compiler_globals->empty_string->gc.u.v.flags |= IS_STR_INTERNED; + zend_interned_empty_string_init(&compiler_globals->empty_string TSRMLS_CC); memset(compiler_globals->one_char_string, 0, sizeof(compiler_globals->one_char_string)); #endif @@ -478,7 +475,7 @@ static void compiler_globals_dtor(zend_compiler_globals *compiler_globals TSRMLS compiler_globals->last_static_member = 0; #ifdef ZTS - zend_string_release(compiler_globals->empty_string); + zend_interned_empty_string_free(&compiler_globals->empty_string TSRMLS_CC); #endif } /* }}} */ |