From 181e91a21353a99fb8b3a72c189b4bb66e9df2da Mon Sep 17 00:00:00 2001 From: David Vossel Date: Mon, 23 May 2011 16:28:14 +0000 Subject: Merged revisions 320568 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r320568 | dvossel | 2011-05-23 11:18:33 -0500 (Mon, 23 May 2011) | 14 lines Merged revisions 320562 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r320562 | dvossel | 2011-05-23 11:15:18 -0500 (Mon, 23 May 2011) | 9 lines Adds missing part to the ast_tcptls_server_start fails second attempt to bind patch. (closes issue #19289) Reported by: wdoekes Patches: issue19289_delay_old_address_setting_tcptls_2.patch uploaded by wdoekes (license 717) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@320606 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/tcptls.c | 1 + 1 file changed, 1 insertion(+) (limited to 'main/tcptls.c') diff --git a/main/tcptls.c b/main/tcptls.c index 8159a49f0..7b32a351a 100644 --- a/main/tcptls.c +++ b/main/tcptls.c @@ -542,6 +542,7 @@ void ast_tcptls_server_stop(struct ast_tcptls_session_args *desc) pthread_cancel(desc->master); pthread_kill(desc->master, SIGURG); pthread_join(desc->master, NULL); + desc->master = AST_PTHREADT_NULL; } if (desc->accept_fd != -1) close(desc->accept_fd); -- cgit v1.2.3