diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-08-20 08:12:37 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-08-20 08:12:37 +0300 |
| commit | 94f2e3a93ab0837d47962643dd976aa5b2d7d5c4 (patch) | |
| tree | 912e1ad71eaec2dfe5f22860ed39c4ada44d6d30 /main/asterisk/ASTERISK-23818.patch | |
| parent | ce2bfc67f9cf32da7d530df889335644237a060e (diff) | |
| download | aports-94f2e3a93ab0837d47962643dd976aa5b2d7d5c4.tar.bz2 aports-94f2e3a93ab0837d47962643dd976aa5b2d7d5c4.tar.xz | |
main/asterisk: upgrade to 12.5.0
Diffstat (limited to 'main/asterisk/ASTERISK-23818.patch')
| -rw-r--r-- | main/asterisk/ASTERISK-23818.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/main/asterisk/ASTERISK-23818.patch b/main/asterisk/ASTERISK-23818.patch deleted file mode 100644 index 0360f4c842..0000000000 --- a/main/asterisk/ASTERISK-23818.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://issues.asterisk.org/jira/browse/ASTERISK-23818 -https://reviewboard.asterisk.org/r/3891 - ---- a/pbx/pbx_lua.c (revision 420123) -+++ b/pbx/pbx_lua.c (working copy) -@@ -1562,7 +1562,7 @@ - return AST_MODULE_LOAD_SUCCESS; - } - --AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Lua PBX Switch", -+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Lua PBX Switch", - .load = load_module, - .unload = unload_module, - .reload = reload, ---- a/main/pbx.c (revision 420123) -+++ b/main/pbx.c (working copy) -@@ -7868,6 +7868,11 @@ - ast_hashtab_end_traversal(prio_iter); - } - ast_hashtab_end_traversal(exten_iter); -+ } else if (new) { -+ /* If the context existed but had no extensions, we still want to merge -+ * the includes, switches and ignore patterns. -+ */ -+ context_merge_incls_swits_igps_other_registrars(new, context, registrar); - } - - if (!insert_count && !new && (strcmp(context->registrar, registrar) != 0 || |