You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

George Joseph 76d1ae97d4 pbx_lua: fix regression with global sym export and context clash by pbx_config. ... ASTERISK-23818 (lua contexts being overwritten by contexts of the same name in pbx_config) surfaced because pbx_lua, having the AST_MODFLAG_GLOBAL_SYMBOLS set, was always force loaded before pbx_config. Since I couldn't find any reason for pbx_lua to export it's symbols to the rest of Asterisk, I simply changed the flag to AST_MODFLAG_DEFAULT. Problem solved. What I didn't realize was that the symbols need to be exported not because Asterisk needs them but because any external Lua modules like luasql.mysql need the base Lua language APIs exported (ASTERISK-17279). Back to ASTERISK-23818... It looks like there's an issue in pbx.c where context_merge was only merging includes, switches and ignore patterns if the context was already existing AND has extensions, or if the context was brand new. If pbx_lua is loaded before pbx_config, the context will exist BUT pbx_lua, being implemented as a switch, will never place extensions in it, just the switch statement. The result is that when pbx_config loads, it never merges the switch statement created by pbx_lua into the final context. This patch sets pbx_lua's modflag back to AST_MODFLAG_GLOBAL_SYMBOLS and adds an "else if" in context_merge that catches the case where an existing context has includes, switchs or ingore patterns but no actual extensions. ASTERISK-23818 #close Reported by: Dennis Guse Reported by: Timo Teräs Tested by: George Joseph Review: https://reviewboard.asterisk.org/r/3891/ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@420146 65c4cc65-6c06-0410-ace0-fbb531ad65f3		11 years ago
..
ael/ael-test	Merged revisions 299448 via svnmerge from	15 years ago
Makefile	Change per-file debug and verbose levels to be per-module, the way	15 years ago
dundi-parser.c	Allow Asterisk to compile under GCC 4.10	11 years ago
dundi-parser.h	Remove built-in AES code and use optional_api instead	15 years ago
pbx_ael.c	Clean up and ensure proper usage of alloca()	13 years ago
pbx_config.c	Allow Asterisk to compile under GCC 4.10	11 years ago
pbx_dundi.c	Allow Asterisk to compile under GCC 4.10	11 years ago
pbx_loopback.c	Check result of ast_var_assign() calls for memory allocation failure.	12 years ago
pbx_lua.c	pbx_lua: fix regression with global sym export and context clash by pbx_config.	11 years ago
pbx_realtime.c	Clean up and ensure proper usage of alloca()	13 years ago
pbx_spool.c	Fix processing of call files when using KQueue on OS X	12 years ago