Merged revisions 187428 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Thu, 9 Apr 2009 18:40:01 +0000 (18:40 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Thu, 9 Apr 2009 18:40:01 +0000 (18:40 +0000)
commit39808fa953e65c9c3a2b40f6fe409adea59eb133
tree15138023a164f80a33759fd54aa599c10202e176
parent19f381b4840f505f293610869be0f5290dc88913
Merged revisions 187428 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r187428 | tilghman | 2009-04-09 13:08:20 -0500 (Thu, 09 Apr 2009) | 8 lines

  Race condition between ast_cli_command() and 'module unload' could cause a deadlock.
  Add lock timeouts to avoid this potential deadlock.
  (closes issue #14705)
   Reported by: jamessan
   Patches:
         20090320__bug14705.diff.txt uploaded by tilghman (license 14)
   Tested by: jamessan
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@187483 65c4cc65-6c06-0410-ace0-fbb531ad65f3
include/asterisk/linkedlists.h
include/asterisk/lock.h
main/manager.c