archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.2'

Browse source 
* PHP-7.2:
  Updated NEWS
  Fixed bug #75735 ([embed SAPI] Segmentation fault in sapi_register_post_entry)
This commit is contained in:
Xinchen Hui 2017-12-27 12:52:44 +08:00
commit d6b2756da1
2 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TSRM/TSRM.h
View file

@ -169,8 +169,10 @@ TSRM_API const char *tsrm_api_name(void);
#define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL; #define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL;
#if ZEND_DEBUG #if ZEND_DEBUG
#define TSRMLS_CACHE_UPDATE() TSRMLS_CACHE = tsrm_get_ls_cache() #define TSRMLS_CACHE_UPDATE() TSRMLS_CACHE = tsrm_get_ls_cache()
#define TSRMLS_CACHE_RESET()
#else #else
#define TSRMLS_CACHE_UPDATE() if (!TSRMLS_CACHE) TSRMLS_CACHE = tsrm_get_ls_cache() #define TSRMLS_CACHE_UPDATE() if (!TSRMLS_CACHE) TSRMLS_CACHE = tsrm_get_ls_cache()
#define TSRMLS_CACHE_RESET() TSRMLS_CACHE = NULL
#endif #endif
#define TSRMLS_CACHE _tsrm_ls_cache #define TSRMLS_CACHE _tsrm_ls_cache

1
sapi/embed/php_embed.c
View file

@ -227,6 +227,7 @@ EMBED_SAPI_API void php_embed_shutdown(void)
sapi_shutdown(); sapi_shutdown();
#ifdef ZTS #ifdef ZTS
tsrm_shutdown(); tsrm_shutdown();
TSRMLS_CACHE_RESET();
#endif #endif
if (php_embed_module.ini_entries) { if (php_embed_module.ini_entries) {
free(php_embed_module.ini_entries); free(php_embed_module.ini_entries);