diff options
| author | David M. Lee <dlee@digium.com> | 2013-08-30 20:58:59 +0000 |
|---|---|---|
| committer | David M. Lee <dlee@digium.com> | 2013-08-30 20:58:59 +0000 |
| commit | 2d1d5a98d587f30311e254c7de623434dff07dd1 (patch) | |
| tree | cc4f15e91dc7ccd3df726f7f6af98355c76347a5 /main/asterisk.c | |
| parent | be219c9ec9bcb1e54b8eed5ffaf7bced2f34abc4 (diff) | |
Fix graceful shutdown crash.
The cleanup code for optional_api needs to happen after all of the optional
API users and providers have unused/unprovided. Unfortunately, regsitering the
atexit() handler at the beginning of main() isn't soon enough, since module
destructors run after that.
........
Merged revisions 398149 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@398150 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/asterisk.c')
| -rw-r--r-- | main/asterisk.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 395d0cc18..3b08d76c5 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -247,7 +247,6 @@ int daemon(int, int); /* defined in libresolv of all places */ #include "asterisk/stasis_endpoints.h" #include "asterisk/stasis_system.h" #include "asterisk/security_events.h" -#include "asterisk/optional_api.h" #include "../defaults.h" @@ -4169,10 +4168,6 @@ int main(int argc, char *argv[]) ast_el_read_history(filename); } -#if defined(OPTIONAL_API) - ast_register_cleanup(optional_api_cleanup); -#endif - ast_json_init(); ast_ulaw_init(); ast_alaw_init(); |