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 /sapi/embed/php_embed.c | |
| 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 'sapi/embed/php_embed.c')
| -rw-r--r-- | sapi/embed/php_embed.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c index e444610d77..e2a27a192c 100644 --- a/sapi/embed/php_embed.c +++ b/sapi/embed/php_embed.c @@ -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); |