diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-12-27 12:52:44 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-12-27 12:52:44 +0800 |
| commit | d6b2756da16f3845d6ff46f3dbaea28dbe9c914e (patch) | |
| tree | c2db82c2e246c6a94f2e07c592871fe9b1591fa0 /TSRM | |
| parent | 6e4d18924bc43702f4e69087c7b09fc6a96e1935 (diff) | |
| parent | 14304faae26479763d14addafbd0ed975b358404 (diff) | |
| download | php-git-d6b2756da16f3845d6ff46f3dbaea28dbe9c914e.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
Updated NEWS
Fixed bug #75735 ([embed SAPI] Segmentation fault in sapi_register_post_entry)
Diffstat (limited to 'TSRM')
| -rw-r--r-- | TSRM/TSRM.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h index 2ab1f44ced..875f39e5a4 100644 --- a/TSRM/TSRM.h +++ b/TSRM/TSRM.h @@ -169,8 +169,10 @@ TSRM_API const char *tsrm_api_name(void); #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 |