Merged revisions 113065 via svnmerge from
authorMark Michelson <mmichelson@digium.com>
Mon, 7 Apr 2008 16:12:30 +0000 (16:12 +0000)
committerMark Michelson <mmichelson@digium.com>
Mon, 7 Apr 2008 16:12:30 +0000 (16:12 +0000)
commitbe02a941387d3c012f00ef8389a238cba2a33cf1
tree537a129e43df88cde9db37aa7492bbc0ed8504da
parent566e073606dbdab2f9498f395964217c54b7c1fc
Merged revisions 113065 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r113065 | mmichelson | 2008-04-07 11:08:45 -0500 (Mon, 07 Apr 2008) | 13 lines

This fix prevents a deadlock that was experienced in chan_local. There was
deadlock prevention in place in chan_local, but it would not work in a specific
case because the channel was recursively locked. By unlocking the channel prior
to calling the generator's generate callback in ast_read_generator_actions(), we
prevent the recursive locking, and therefore the deadlock.

(closes issue #12307)
Reported by: callguy
Patches:
      12307.patch uploaded by putnopvut (license 60)
Tested by: callguy

........

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