[svn-commits] jpeeler: branch 1.6.1 r239841 - in /branches/1.6.1: ./ main/features.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Wed Jan 13 13:52:08 2010
New Revision: 239841

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=239841
Log:
Merged revisions 239839 via svnmerge from 
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 )
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/features.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/main/features.c?view=diff&rev=239841&r1=239840&r2=239841
==============================================================================
--- branches/1.6.1/main/features.c (original)
+++ branches/1.6.1/main/features.c Wed Jan 13 13:52:08 2010
@@ -790,6 +790,11 @@
 
 	/* 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)))