From ebf40f1129670e034f535777cac029fca74c7275 Mon Sep 17 00:00:00 2001 From: Jonathan Rose Date: Thu, 5 Jan 2012 16:16:51 +0000 Subject: [PATCH] Ensures Asterisk closes when receiving terminal signals in 'no fork' mode. When catching a signal, in no fork mode the console thread is identical to the thread responsible for catching the signal and closing Asterisk, which requires it to first dispense with the console thread. Prior to this patch, if these threads were identical, upon receiving a killing signal, the thread will send an URG signal to itself, which we also catch and then promptly do nothing with. Obviously this isn't useful behavior. (closes issue ASTERISK-19127) Reported By: Bryon Clark Patches: quit_on_signals.patch uploaded by Bryon Clark (license 6157) ........ Merged revisions 349672 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 349673 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@349674 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/asterisk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/asterisk.c b/main/asterisk.c index 48192758c6..37bc92f5c1 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -3128,7 +3128,7 @@ static void *monitor_sig_flags(void *unused) } if (sig_flags.need_quit) { sig_flags.need_quit = 0; - if (consolethread != AST_PTHREADT_NULL) { + if ((consolethread != AST_PTHREADT_NULL) && (consolethread != pthread_self())) { sig_flags.need_quit_handler = 1; pthread_kill(consolethread, SIGURG); } else {