[asterisk-commits] jpeeler: trunk r239839 - in /trunk: ./ main/features.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Wed Jan 13 13:48:16 2010
New Revision: 239839

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=239839
Log:
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:
    trunk/   (props changed)
    trunk/main/features.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/features.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/features.c?view=diff&rev=239839&r1=239838&r2=239839
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Wed Jan 13 13:48:16 2010
@@ -983,6 +983,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)))
 		ast_frfree(f);