diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-04 16:14:26 +0200 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-04 16:14:26 +0200 |
commit | 18060e592373f350a96d205dc4d002206dc4fcb7 (patch) | |
tree | 9d5d124634d0460b1431576ce287e171d90f3ad9 | |
parent | d512075ff81120ba3306a5e08413d6c941056d1e (diff) | |
parent | a4633b13d4dc33c067159192a0e0f146e03f8738 (diff) | |
download | php-git-18060e592373f350a96d205dc4d002206dc4fcb7.tar.gz |
Merge branch 'PHP-7.3' into PHP-7.4
-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 3af42d9b67..3e3e7d656e 100644 --- a/TSRM/TSRM.h +++ b/TSRM/TSRM.h @@ -185,13 +185,7 @@ TSRM_API const char *tsrm_api_name(void); #define TSRMG_FAST_BULK_STATIC(offset, type) ((type) (((char*) TSRMLS_CACHE)+(offset))) #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 d651f6b491..4c7dec6dd0 100644 --- a/sapi/embed/php_embed.c +++ b/sapi/embed/php_embed.c @@ -225,7 +225,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); |