diff options
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | TSRM/TSRM.h | 2 | ||||
| -rw-r--r-- | sapi/embed/php_embed.c | 1 |
3 files changed, 7 insertions, 0 deletions
@@ -13,6 +13,10 @@ PHP NEWS . Fixed bug #75671 (pg_version() crashes when called on a connection to cockroach). (magicaltux at gmail dot com) +- SAPI: + . Fixed bug #75735 ([embed SAPI] Segmentation fault in + sapi_register_post_entry). (Laruence) + - SOAP: . Fixed bug #70469 (SoapClient generates E_ERROR even if exceptions=1 is used). (Anton Artamonov) diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h index f9bb241050..458843a689 100644 --- a/TSRM/TSRM.h +++ b/TSRM/TSRM.h @@ -174,8 +174,10 @@ TSRM_API void *tsrm_get_ls_cache(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 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); |