kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-07 10:28:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 239839 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r239839 | jpeeler | 2010-01-13 13:48:16 -0600 (Wed, 13 Jan 2010) | 18 lines
  
  Merged revisions 239838 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r239838 | jpeeler | 2010-01-13 13:43:33 -0600 (Wed, 13 Jan 2010) | 11 lines
    
    Fix regression for timed out parked call returning to caller
    
    This issue seems to have been exposed by the fix in 160390 whereby using a
    masquerade prevented a crash. The new channel used in the masquerade was
    not copying the macro information from the old channel.
    
    (closes issue #15459)
    Reported by: djrodman
    Patches: 
          patch_15459.txt uploaded by mnick (license )
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@239842 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler
2010-01-13 19:52:36 +00:00
parent 212fdb7360
commit 32ab9b2bfb
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main/features.c
View File

@@ -640,6 +640,11 @@ static int masq_park_call(struct ast_channel *rchan, struct ast_channel *peer, i
/* Setup the extensions and such */
set_c_e_p(chan, rchan->context, rchan->exten, rchan->priority);
/* Setup the macro extension and such */
ast_copy_string(chan->macrocontext,rchan->macrocontext,sizeof(chan->macrocontext));
ast_copy_string(chan->macroexten,rchan->macroexten,sizeof(chan->macroexten));
chan->macropriority = rchan->macropriority;
/* Make the masq execute */
if ((f = ast_read(chan)))
ast_frfree(f);