From ba7ffbe5005db9753a75e4a376bc37e11b0701a7 Mon Sep 17 00:00:00 2001 From: "David M. Lee" Date: Wed, 21 Aug 2013 17:12:30 +0000 Subject: Complete http_shutdown. This patch frees up some resources allocated in http.c. * tcp listeners stopped * tls settings freed * uri redirects freed * unregister internal http.c uri's (closes issue ASTERISK-22237) Reported by: Corey Farrell Patches: http.patch uploaded by Corey Farrell (license 5909) ........ Merged revisions 397308 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 397309 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@397310 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/http.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/main/http.c b/main/http.c index 745f126cc..5d764b4ce 100644 --- a/main/http.c +++ b/main/http.c @@ -1334,7 +1334,25 @@ static struct ast_cli_entry cli_http[] = { static void http_shutdown(void) { + struct http_uri_redirect *redirect; ast_cli_unregister_multiple(cli_http, ARRAY_LEN(cli_http)); + + ast_tcptls_server_stop(&http_desc); + if (http_tls_cfg.enabled) { + ast_tcptls_server_stop(&https_desc); + } + ast_free(http_tls_cfg.certfile); + ast_free(http_tls_cfg.pvtfile); + ast_free(http_tls_cfg.cipher); + + ast_http_uri_unlink(&statusuri); + ast_http_uri_unlink(&staticuri); + + AST_RWLIST_WRLOCK(&uri_redirects); + while ((redirect = AST_RWLIST_REMOVE_HEAD(&uri_redirects, entry))) { + ast_free(redirect); + } + AST_RWLIST_UNLOCK(&uri_redirects); } int ast_http_init(void) -- cgit v1.2.3