diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-19 20:34:13 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-19 20:34:13 +0000 |
| commit | 45bd3ef8028ef0d5363b2da67a15c892ba50be1e (patch) | |
| tree | 05af19dffaca8a5160665ae8c65ba438c9af5a4a /channels | |
| parent | 11049a7a0b566bfc5abafd81361b7ad0250e9389 (diff) | |
Merged revisions 213093 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r213093 | tilghman | 2009-08-19 15:29:41 -0500 (Wed, 19 Aug 2009) | 7 lines
If we have realtime caching enabled, 'sip reload' must purge users/peers, even if the config files haven't changed.
(closes issue #12869)
Reported by: bcnit
Patches:
20090819__issue12869__2.diff.txt uploaded by tilghman (license 14)
Tested by: lasko
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@213095 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 3b2cbd039..611feb9c3 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -23431,7 +23431,7 @@ static int reload_config(enum channelreloadreason reason) char *cat, *stringp, *context, *oldregcontext; char newcontexts[AST_MAX_CONTEXT], oldcontexts[AST_MAX_CONTEXT]; struct ast_flags dummy[2]; - struct ast_flags config_flags = { reason == CHANNEL_MODULE_LOAD ? 0 : CONFIG_FLAG_FILEUNCHANGED }; + struct ast_flags config_flags = { reason == CHANNEL_MODULE_LOAD ? 0 : ast_test_flag(&global_flags[1], SIP_PAGE2_RTCACHEFRIENDS) ? 0 : CONFIG_FLAG_FILEUNCHANGED }; int auto_sip_domains = FALSE; struct sockaddr_in old_bindaddr = bindaddr; int registry_count = 0, peer_count = 0; |