diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-04 15:23:10 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-04 16:12:59 +0200 |
| commit | 2d3bc71e89e270e90ba0886eef37ea106f010ca0 (patch) | |
| tree | 259b0b863da9e7de2c66e9c55c8cc17d35580328 | |
| parent | ac60007becc7943d1da95ec0f9f92c6a3325ec72 (diff) | |
| download | php-git-2d3bc71e89e270e90ba0886eef37ea106f010ca0.tar.gz | |
Reload tsrmls_id in release builds as well
If TSRM is shut down and started again (something that phpdbg does),
then tsrmls_id needs to be reloaded everywhere. As tsrmls_id
update is a rare operation, doing that shouldn't be a problem.
| -rw-r--r-- | TSRM/TSRM.h | 6 | ||||
| -rw-r--r-- | sapi/embed/php_embed.c | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h index 1485b38e7d..af72b4d8e9 100644 --- a/TSRM/TSRM.h +++ b/TSRM/TSRM.h @@ -179,13 +179,7 @@ TSRM_API uint8_t tsrm_is_main_thread(void); #define TSRMG_BULK_STATIC(id, type) ((type) (*((void ***) TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(id)]) #define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE; #define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL; -#if ZEND_DEBUG #define TSRMLS_CACHE_UPDATE() TSRMLS_CACHE = tsrm_get_ls_cache() -#define TSRMLS_CACHE_RESET() -#else -#define TSRMLS_CACHE_UPDATE() if (!TSRMLS_CACHE) TSRMLS_CACHE = tsrm_get_ls_cache() -#define TSRMLS_CACHE_RESET() TSRMLS_CACHE = NULL -#endif #define TSRMLS_CACHE _tsrm_ls_cache /* BC only */ diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c index 109d908ef2..c279c9e372 100644 --- a/sapi/embed/php_embed.c +++ b/sapi/embed/php_embed.c @@ -227,7 +227,6 @@ EMBED_SAPI_API void php_embed_shutdown(void) sapi_shutdown(); #ifdef ZTS tsrm_shutdown(); - TSRMLS_CACHE_RESET(); #endif if (php_embed_module.ini_entries) { free(php_embed_module.ini_entries); |