summaryrefslogtreecommitdiff
path: root/channels/chan_gtalk.c
diff options
context:
space:
mode:
authorSteve Murphy <murf@digium.com>2007-06-19 18:31:29 +0000
committerSteve Murphy <murf@digium.com>2007-06-19 18:31:29 +0000
commitcd97d6a687566c74f7d2f623d5854bd601c8a4da (patch)
tree813d8fc889d65edaaf1394d58300e857f1811cd8 /channels/chan_gtalk.c
parent9bec4f4b5857061ae8b74228f75bb984525fa5e9 (diff)
Merged revisions 70062 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r70062 | murf | 2007-06-19 12:23:23 -0600 (Tue, 19 Jun 2007) | 9 lines Merged revisions 70053 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r70053 | murf | 2007-06-19 12:07:59 -0600 (Tue, 19 Jun 2007) | 1 line This fixes 9246, where channel variables are not available in the 'h' exten, on a 'ZOMBIE' channel. The fix is to consolidate the channel variables during a masquerade, and then copy the merged variables back onto the clone, so the zombie has the same vars that the 'original' has. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@70063 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_gtalk.c')
0 files changed, 0 insertions, 0 deletions