Merged revisions 105804 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
r105804 | russell | 2008-03-04 16:28:03 -0600 (Tue, 04 Mar 2008) | 2 lines

add a destroy API call for a server instance

........


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@106305 f38db490-d61c-443f-a65b-d21fe96a405b

3 files changed, 8 insertions, 2 deletions

diff --git a/main/http.c b/main/http.c
index 11db1779c..7588461e2 100644
--- a/main/http.c
+++ b/main/http.c
@@ -827,7 +827,7 @@ static void *httpd_helper_thread(void *data)
 
 done:
 	fclose(ser->f);
-	ast_free(ser);
+	ser = ast_tcptls_server_instance_destroy(ser);
 	return NULL;
 }
 
diff --git a/main/manager.c b/main/manager.c
index ec8362b08..f8267a4ca 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -2882,7 +2882,7 @@ static void *session_do(void *data)
 	destroy_session(s);
 
 done:
-	ast_free(ser);
+	ser = ast_tcptls_server_instance_destroy(ser);
 	return NULL;
 }
 
diff --git a/main/tcptls.c b/main/tcptls.c
index d623420a5..658ab25ee 100644
--- a/main/tcptls.c
+++ b/main/tcptls.c
@@ -446,3 +446,9 @@ void *ast_make_file_from_fd(void *data)
 	else
 		return ser;
 }
+
+struct ast_tcptls_server_instance *ast_tcptls_server_instance_destroy(struct ast_tcptls_server_instance *i)
+{
+	ast_free(i);
+	return NULL;
+}