[asterisk-commits] pabelanger: trunk r414196 - in /trunk: ./ res/res_stasis_answer.c

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Mon May 19 14:52:34 2014
New Revision: 414196

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=414196
Log:
Replace __ast_answer with ast_raw_answer in app_control_answer

While load testing an ARI application, I noticed asterisk was returning HTTP 500
internal server errors on channels/:id/answer.  After talking to #asterisk-dev,
the issue appeared to be a lack of media flowing after __ast_answer() was
called.  So now, we call ast_raw_answer instead and no longer wait for media.

ASTERISK-23758 #close
Review: https://reviewboard.asterisk.org/r/3549/
........

Merged revisions 414195 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/res/res_stasis_answer.c

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

Modified: trunk/res/res_stasis_answer.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_stasis_answer.c?view=diff&rev=414196&r1=414195&r2=414196
==============================================================================
--- trunk/res/res_stasis_answer.c (original)
+++ trunk/res/res_stasis_answer.c Mon May 19 14:52:34 2014
@@ -38,10 +38,9 @@
 static int app_control_answer(struct stasis_app_control *control,
 	struct ast_channel *chan, void *data)
 {
-	const int delay = 0;
 	ast_debug(3, "%s: Answering\n",
 		stasis_app_control_get_channel_id(control));
-	return __ast_answer(chan, delay);
+	return ast_raw_answer(chan);
 }
 
 int stasis_app_control_answer(struct stasis_app_control *control)