From 428d7e41ef44e8927280157a528b775497ea389a Mon Sep 17 00:00:00 2001 From: jpeeler Date: Thu, 4 Sep 2008 18:35:26 +0000 Subject: Merged revisions 141039 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r141039 | jpeeler | 2008-09-04 12:27:56 -0500 (Thu, 04 Sep 2008) | 15 lines Merged revisions 141028 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r141028 | jpeeler | 2008-09-04 12:00:29 -0500 (Thu, 04 Sep 2008) | 7 lines (closes issue #11979) Fixes multiple parking problems: Crash when executing a park on an extension dialed by AGI due to not returning the proper return code. Crash when using a builtin feature that was a subset of a enabled dynamic feature. Crash due to always hanging up the peer despite the fact that the peer was supposed to be parked. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@141086 f38db490-d61c-443f-a65b-d21fe96a405b --- res/res_agi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'res') diff --git a/res/res_agi.c b/res/res_agi.c index e970f1715..a5aa1074c 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -2966,7 +2966,7 @@ static int agi_exec_full(struct ast_channel *chan, void *data, int enhanced, int return -1; } - return 0; + return res; } static int agi_exec(struct ast_channel *chan, void *data) -- cgit v1.2.3