diff options
| author | Russell Bryant <russell@russellbryant.com> | 2008-01-28 17:21:24 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2008-01-28 17:21:24 +0000 |
| commit | 1c74c549d7e18392a157b3a54b5d2a34d061916c (patch) | |
| tree | 71630b456aae80ecb9da5fe4c0b4fce68bbada92 /channels/chan_zap.c | |
| parent | f877028d76b9f37ecf352409a30a0c215b0033cf (diff) | |
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
Diffstat (limited to 'channels/chan_zap.c')
0 files changed, 0 insertions, 0 deletions