From e3a0bbf2d06a776f7f000521bab473101ab9642b Mon Sep 17 00:00:00 2001
From: root <root@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Mon, 3 Jul 2006 06:03:44 +0000
Subject: automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@36776 f38db490-d61c-443f-a65b-d21fe96a405b
---
 asterisk.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/asterisk.c b/asterisk.c
index b10dcba10..abb0a4392 100644
--- a/asterisk.c
+++ b/asterisk.c
@@ -592,6 +592,7 @@ static void *listener(void *unused)
 		fds[0].fd = ast_socket;
 		fds[0].events= POLLIN;
 		s = poll(fds, 1, -1);
+		pthread_testcancel();
 		if (s < 0) {
 			if (errno != EINTR)
 				ast_log(LOG_WARNING, "poll returned error: %s\n", strerror(errno));
@@ -905,13 +906,13 @@ static void quit_handler(int num, int nice, int safeshutdown, int restart)
 		ast_log(LOG_DEBUG, "Asterisk ending (%d).\n", num);
 	manager_event(EVENT_FLAG_SYSTEM, "Shutdown", "Shutdown: %s\r\nRestart: %s\r\n", ast_active_channels() ? "Uncleanly" : "Cleanly", restart ? "True" : "False");
 	if (ast_socket > -1) {
+		pthread_cancel(lthread);
 		close(ast_socket);
 		ast_socket = -1;
+		unlink(ast_config_AST_SOCKET);
 	}
 	if (ast_consock > -1)
 		close(ast_consock);
-	if (ast_socket > -1)
-		unlink((char *)ast_config_AST_SOCKET);
 	if (!option_remote) unlink((char *)ast_config_AST_PID);
 	printf(term_quit());
 	if (restart) {
-- 
cgit v1.2.3