[asterisk-commits] oej: branch 1.6.1 r237138 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: oej
Date: Sat Jan  2 04:01:48 2010
New Revision: 237138

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=237138
Log:
Merged revisions 237136 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r237136 | oej | 2010-01-02 10:54:22 +0100 (Lör, 02 Jan 2010) | 10 lines

Merged revisions 237135 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r237135 | oej | 2010-01-02 10:52:30 +0100 (Lör, 02 Jan 2010) | 2 lines

Release memory of the contact acl before unloading module

........

................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_sip.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=237138&r1=237137&r2=237138
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Sat Jan  2 04:01:48 2010
@@ -24785,6 +24785,7 @@
 	ao2_t_ref(threadt, -1, "unref the thread table");
 
 	clear_sip_domains();
+	ast_free_ha(global_contact_ha);
 	close(sipsock);
 	sched_context_destroy(sched);
 	con = ast_context_find(used_context);