dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

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: http://svn.digium.com/svn/asterisk/trunk@320606 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
dvossel 2011-05-23 16:28:14 +00:00
parent e62309fa10
commit e7e1957a37
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
main/tcptls.c
View File

@ -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);