[svn-commits] bebuild: tag 10.6.1 r370102 - in /tags/10.6.1: ./ main/

[SVN commits to the Digium repositories]

Author: bebuild
Date: Mon Jul 16 09:29:25 2012
New Revision: 370102

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=370102
Log:
Merge 369732 for 10.6.1

Removed:
    tags/10.6.1/asterisk-10.6.0-summary.html
    tags/10.6.1/asterisk-10.6.0-summary.txt
Modified:
    tags/10.6.1/   (props changed)
    tags/10.6.1/.version
    tags/10.6.1/main/tcptls.c

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

Propchange: tags/10.6.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 16 09:29:25 2012
@@ -1,1 +1,1 @@
-/branches/10:368947,369044,369067,369215,369437,369558,369580,369627,369653
+/branches/10:368947,369044,369067,369215,369437,369558,369580,369627,369653,369732

Modified: tags/10.6.1/.version
URL: http://svnview.digium.com/svn/asterisk/tags/10.6.1/.version?view=diff&rev=370102&r1=370101&r2=370102
==============================================================================
--- tags/10.6.1/.version (original)
+++ tags/10.6.1/.version Mon Jul 16 09:29:25 2012
@@ -1,1 +1,1 @@
-10.6.0
+10.6.1

Modified: tags/10.6.1/main/tcptls.c
URL: http://svnview.digium.com/svn/asterisk/tags/10.6.1/main/tcptls.c?view=diff&rev=370102&r1=370101&r2=370102
==============================================================================
--- tags/10.6.1/main/tcptls.c (original)
+++ tags/10.6.1/main/tcptls.c Mon Jul 16 09:29:25 2012
@@ -130,9 +130,6 @@
 static void session_instance_destructor(void *obj)
 {
 	struct ast_tcptls_session_instance *i = obj;
-	if (i->parent && i->parent->tls_cfg) {
-		ast_ssl_teardown(i->parent->tls_cfg);
-	}
 	ast_mutex_destroy(&i->lock);
 }