[asterisk-commits] dvossel: trunk r320606 - in /trunk: ./ main/tcptls.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Mon May 23 11:28:14 2011
New Revision: 320606

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=320606
Log:
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)
  ........
................

Modified:
    trunk/   (props changed)
    trunk/main/tcptls.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/main/tcptls.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/tcptls.c?view=diff&rev=320606&r1=320605&r2=320606
==============================================================================
--- trunk/main/tcptls.c (original)
+++ trunk/main/tcptls.c Mon May 23 11:28:14 2011
@@ -542,6 +542,7 @@
 		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);