Merged revisions 244070 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Mon, 1 Feb 2010 17:53:39 +0000 (17:53 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Mon, 1 Feb 2010 17:53:39 +0000 (17:53 +0000)
commit72c1b76038984d5dd3d4b0cd98fb25aaa7f78791
tree2bd1d124d4171b18f5695623f0868d528ea20f95
parent80d3e91714c9664dec2da889fefcefa254884be0
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
channels/chan_local.c
main/channel.c