@@ -87,8 +87,10 @@ void zend_signal_handler_defer(int signo, siginfo_t *siginfo, void *context)
8787 zend_signal_queue_t * queue , * qtmp ;
8888
8989#ifdef ZTS
90- /* A signal could hit after TSRM shutdown, in this case globals are already freed. */
91- if (tsrm_is_shutdown ()) {
90+ /* A signal could hit after TSRM shutdown, in this case globals are already freed.
91+ * Or it could be delivered to a thread that didn't execute PHP yet.
92+ * In the latter case we act as if SIGG(active) is false. */
93+ if (tsrm_is_shutdown () || !tsrm_get_ls_cache ()) {
9294 /* Forward to default handler handler */
9395 zend_signal_handler (signo , siginfo , context );
9496 return ;
@@ -180,7 +182,7 @@ static void zend_signal_handler(int signo, siginfo_t *siginfo, void *context)
180182 sigset_t sigset ;
181183 zend_signal_entry_t p_sig ;
182184#ifdef ZTS
183- if (tsrm_is_shutdown ()) {
185+ if (tsrm_is_shutdown ()|| ! tsrm_get_ls_cache () ) {
184186 p_sig .flags = 0 ;
185187 p_sig .handler = SIG_DFL ;
186188 } else
0 commit comments