[asterisk-commits] bebuild: tag 1.8.14.1 r370104 - in /tags/1.8.14.1: ./ main/

[SVN commits to the Asterisk project]

Author: bebuild
Date: Mon Jul 16 09:29:49 2012
New Revision: 370104

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=370104
Log:
Merge 369731 for 1.8.14.1

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

Propchange: tags/1.8.14.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 16 09:29:49 2012
@@ -1,1 +1,1 @@
-/branches/1.8:369043,369066,369214,369436,369557,369579,369626,369652
+/branches/1.8:369043,369066,369214,369436,369557,369579,369626,369652,369731

Modified: tags/1.8.14.1/.version
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.14.1/.version?view=diff&rev=370104&r1=370103&r2=370104
==============================================================================
--- tags/1.8.14.1/.version (original)
+++ tags/1.8.14.1/.version Mon Jul 16 09:29:49 2012
@@ -1,1 +1,1 @@
-1.8.14.0
+1.8.14.1

Modified: tags/1.8.14.1/main/tcptls.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.14.1/main/tcptls.c?view=diff&rev=370104&r1=370103&r2=370104
==============================================================================
--- tags/1.8.14.1/main/tcptls.c (original)
+++ tags/1.8.14.1/main/tcptls.c Mon Jul 16 09:29:49 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);
 }