[svn-commits] mmichelson: branch 1.6.0 r127158 - in /branches/1.6.0: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Tue Jul  1 16:16:33 2008
New Revision: 127158

URL: http://svn.digium.com/view/asterisk?view=rev&rev=127158
Log:
Merged revisions 127157 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r127157 | mmichelson | 2008-07-01 16:16:00 -0500 (Tue, 01 Jul 2008) | 8 lines

Place the delay in __ast_answer prior to the channel-specific answer
callback. This change differs from commit 127113 in that now the 
channel is not set to AST_STATE_UP until after the answer callback.

(closes issue #12924)
Reported by: snyfer


........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/channel.c

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

Modified: branches/1.6.0/main/channel.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/channel.c?view=diff&rev=127158&r1=127157&r2=127158
==============================================================================
--- branches/1.6.0/main/channel.c (original)
+++ branches/1.6.0/main/channel.c Tue Jul  1 16:16:33 2008
@@ -1682,7 +1682,6 @@
 		if (delay) {
 			int needanswer = (chan->tech->answer != NULL);
 
-			ast_setstate(chan, AST_STATE_UP);
 			ast_cdr_answer(chan->cdr);
 			ast_channel_unlock(chan);
 			ast_safe_sleep(chan, delay);
@@ -1695,6 +1694,7 @@
 				res = chan->tech->answer(chan);
 				ast_channel_unlock(chan);
 			}
+			ast_setstate(chan, AST_STATE_UP);	
 		} else {
 			if (chan->tech->answer) {
 				res = chan->tech->answer(chan);