From 2d5fec20cafac485bdea075acf17fbfd0acfca89 Mon Sep 17 00:00:00 2001 From: tilghman Date: Mon, 1 Feb 2010 18:01:51 +0000 Subject: Merged revisions 244071 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r244071 | tilghman | 2010-02-01 11:53:39 -0600 (Mon, 01 Feb 2010) | 22 lines Merged revisions 244070 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r244070 | tilghman | 2010-02-01 11:46:31 -0600 (Mon, 01 Feb 2010) | 16 lines Revert previous chan_local fix (r236981) and fix instead by destroying expired frames in the queue. (closes issue #16525) Reported by: kobaz Patches: 20100126__issue16525.diff.txt uploaded by tilghman (license 14) 20100129__issue16525__1.6.0.diff.txt uploaded by tilghman (license 14) Tested by: kobaz, atis (closes issue #16581) Reported by: ZX81 (closes issue #16681) Reported by: alexr1 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@244074 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_local.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'channels') diff --git a/channels/chan_local.c b/channels/chan_local.c index 1cfe30f48..724c721f8 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -251,9 +251,7 @@ static int local_queue_frame(struct local_pvt *p, int isoutbound, struct ast_fra } if (other) { - if (other->pbx || other->_bridge || !ast_strlen_zero(other->appl)) { - ast_queue_frame(other, f); - } /* else the frame won't go anywhere */ + ast_queue_frame(other, f); ast_channel_unlock(other); } -- cgit v1.2.3