Merged revisions 329995 via svnmerge from
authorJason Parker <jparker@digium.com>
Thu, 28 Jul 2011 15:46:16 +0000 (15:46 +0000)
committerJason Parker <jparker@digium.com>
Thu, 28 Jul 2011 15:46:16 +0000 (15:46 +0000)
commit16a32f503017e4ec4614cf726ba9c3b8f4f496e0
tree70e281be55fe4bc9dc279c52164ed1a1bea5ccfe
parentb05b37dc535f8ffe2872428dfc36fe81057a2ef9
Merged revisions 329995 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r329995 | qwell | 2011-07-28 10:45:49 -0500 (Thu, 28 Jul 2011) | 13 lines

  Merged revisions 329994 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r329994 | qwell | 2011-07-28 10:45:24 -0500 (Thu, 28 Jul 2011) | 6 lines

    Fix a SIP transfer deadlock.

    The locking in this function is very scary.  There are like 6 structs involved.

    (closes issue AST-470)
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@329996 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/chan_sip.c