Merged revisions 100581 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Mon, 28 Jan 2008 17:21:24 +0000 (17:21 +0000)
committerRussell Bryant <russell@russellbryant.com>
Mon, 28 Jan 2008 17:21:24 +0000 (17:21 +0000)
commit1c74c549d7e18392a157b3a54b5d2a34d061916c
tree71630b456aae80ecb9da5fe4c0b4fce68bbada92
parentf877028d76b9f37ecf352409a30a0c215b0033cf
Merged revisions 100581 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r100581 | russell | 2008-01-28 11:15:41 -0600 (Mon, 28 Jan 2008) | 9 lines

Make some deadlock related fixes.  These bugs were discovered and reported
internally at Digium by Steve Pitts.
 - Fix up chan_local to ensure that the channel lock is held before the local
   pvt lock.
 - Don't hold the channel lock when executing the timing function, as it can
   cause a deadlock when using chan_local.  This actually changes the code back
   to be how it was before the change for issue #10765.  But, I added some other
   locking that I think will prevent the problem reported there, as well.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@100582 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/chan_local.c
include/asterisk/channel.h
main/channel.c