automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@9627 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_page.c b/apps/app_page.c
index 39a0eb4bcfac5799bb9b6a1be05031b688cfd2fc..7826d285bee573788e8fd2d14f8639a2af5979ed 100644 (file)
--- a/apps/app_page.c
+++ b/apps/app_page.c
@@ -85,7 +85,7 @@ static void *page_thread(void *data)
 {
        struct calloutdata *cd = data;
        ast_pbx_outgoing_app(cd->tech, AST_FORMAT_SLINEAR, cd->resource, 30000,
-               "MeetMe", cd->meetmeopts, NULL, 0, cd->cidnum, cd->cidname, cd->variables, NULL);
+               "MeetMe", cd->meetmeopts, NULL, 0, cd->cidnum, cd->cidname, cd->variables, NULL, NULL);
        free(cd);
        return NULL;
 }

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 7fb8fdd887d7cdf43443cf8d1dc8ef98f1bcb894..d7dbd66f32fa5d0984bbee81f7f24691f7f20092 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -9506,6 +9506,7 @@ static int __unload_module(void)
        ast_channel_unregister(&iax2_tech);
        delete_users();
        iax_provision_unload();
+       sched_context_destroy(sched);
        return 0;
 }
 

diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index d3b68e22685142677dea8e9dc6dfd31c9aaa5a2e..7538fd9d74a8c0aa533f6439810ebf43c7f50303 100644 (file)
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -4388,6 +4388,7 @@ int unload_module()
        ast_cli_unregister(&cli_debug);
        ast_cli_unregister(&cli_no_debug);
        ast_cli_unregister(&cli_mgcp_reload);
+       sched_context_destroy(sched);
 
        return 0;
 }

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 74b889b9e06a06c86ef53a9974fd09d9a6a1da06..95f58015ca8007b80792e2c8ff0143e7fc2cecbe 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -13381,6 +13381,7 @@ int unload_module()
        clear_realm_authentication(authl);
        clear_sip_domains();
        close(sipsock);
+       sched_context_destroy(sched);
                
        return 0;
 }

diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index b978d28a6fdc627f796e33222389b20ea97d3370..8f0457296dd36d164d42dd92467a78bd9992add6 100644 (file)
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -4726,6 +4726,7 @@ int unload_module(void)
        ast_unregister_switch(&dundi_switch);
        ast_custom_function_unregister(&dundi_function);
        res = ast_unregister_application(app);
+       sched_context_destroy(sched);
        return res;
 }