summaryrefslogtreecommitdiff
path: root/sapi/embed
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-06-04 16:14:14 +0200
committerNikita Popov <nikita.ppv@gmail.com>2019-06-04 16:14:14 +0200
commita4633b13d4dc33c067159192a0e0f146e03f8738 (patch)
treee59dcfbcf566e39a3492571a6d98313b8a26a3cc /sapi/embed
parent9a495911c86f0304bd4a18dd32e8765696087099 (diff)
parent2d3bc71e89e270e90ba0886eef37ea106f010ca0 (diff)
downloadphp-git-a4633b13d4dc33c067159192a0e0f146e03f8738.tar.gz
Merge branch 'PHP-7.2' into PHP-7.3
Diffstat (limited to 'sapi/embed')
-rw-r--r--sapi/embed/php_embed.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c
index 6b21825ba0..d93149b462 100644
--- a/sapi/embed/php_embed.c
+++ b/sapi/embed/php_embed.c
@@ -226,7 +226,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);