diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-12-27 12:52:06 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-12-27 12:52:06 +0800 |
| commit | 6693898b30ab5cb9437f7423ac1c7bb7be9d775d (patch) | |
| tree | 708491bab3dc463c5bccd7d04f9a099d4380206a /sapi/embed/php_embed.c | |
| parent | eb5ba59ad5cd40ef47cb6bdbe8dbb15e2f4d6e42 (diff) | |
| parent | dc3822c3431ec3229ad439c3e4e4b956218777af (diff) | |
| download | php-git-6693898b30ab5cb9437f7423ac1c7bb7be9d775d.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
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); |