Skip to content

Commit

Permalink
Merge branch 'PHP-7.2'
Browse files Browse the repository at this point in the history
* PHP-7.2:
  Updated NEWS
  Fixed bug #75735 ([embed SAPI] Segmentation fault in sapi_register_post_entry)
  • Loading branch information
laruence committed Dec 27, 2017
2 parents 6e4d189 + 14304fa commit d6b2756
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions TSRM/TSRM.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions sapi/embed/php_embed.c
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ 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);
Expand Down

0 comments on commit d6b2756

Please sign in to comment.