diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-02-01 17:53:39 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-02-01 17:53:39 +0000 |
| commit | 72c1b76038984d5dd3d4b0cd98fb25aaa7f78791 (patch) | |
| tree | 2bd1d124d4171b18f5695623f0868d528ea20f95 /channels/chan_local.c | |
| parent | 80d3e91714c9664dec2da889fefcefa254884be0 (diff) | |
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: https://origsvn.digium.com/svn/asterisk/trunk@244071 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_local.c')
| -rw-r--r-- | channels/chan_local.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c index c1eaf92f2..00c058da1 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -257,9 +257,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); } |