summaryrefslogtreecommitdiff
path: root/pbx/pbx_config.c
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2007-02-26 20:09:06 +0000
committerJoshua Colp <jcolp@digium.com>2007-02-26 20:09:06 +0000
commite83cff1c23267d262ca37608b185d90833e03e3a (patch)
treec8b18d77f8d359fb5930281e735049058360daf4 /pbx/pbx_config.c
parentc617945b5c92a6b3cc0475aee247a82e8acc4735 (diff)
Merged revisions 56856 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r56856 | file | 2007-02-26 15:07:18 -0500 (Mon, 26 Feb 2007) | 10 lines Merged revisions 56850 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r56850 | file | 2007-02-26 15:05:02 -0500 (Mon, 26 Feb 2007) | 2 lines Obey the clearglobalvars option in extensions reload (or dialplan reload depending on your version). (issue #9146 reported by ramonpeek) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@56860 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'pbx/pbx_config.c')
-rw-r--r--pbx/pbx_config.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index 6bf1a6053..217fb23ce 100644
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -1272,6 +1272,8 @@ static int handle_reload_extensions(int fd, int argc, char *argv[])
{
if (argc != 2)
return RESULT_SHOWUSAGE;
+ if (clearglobalvars_config)
+ pbx_builtin_clear_globals();
pbx_load_module();
return RESULT_SUCCESS;
}