]> git.ipfire.org Git - thirdparty/asterisk.git/commit
Merged revisions 369283 via svnmerge from
authorAutomerge script <automerge@asterisk.org>
Sat, 23 Jun 2012 00:20:56 +0000 (00:20 +0000)
committerAutomerge script <automerge@asterisk.org>
Sat, 23 Jun 2012 00:20:56 +0000 (00:20 +0000)
commit17a5e814f5212cce7f4c94bf03b1b472210d288d
tree293c4b8ce246e0308e0ef0c707bca4975df545b9
parentf3cc355870e5ba91953f1b2ec049c44f17270d6a
Merged revisions 369283 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

................
  r369283 | rmudgett | 2012-06-22 19:12:27 -0500 (Fri, 22 Jun 2012) | 22 lines

  Fix Bridge application and AMI Bridge action error handling.

  * Fix AMI Bridge action disconnecting the AMI link on error.

  * Fix AMI Bridge action and Bridge application not checking if their
  masquerades were successful.

  * Fix Bridge application running the h-exten when it should not.

  * Made do_bridge_masquerade() return if the masquerade was successful so
  the Bridge application and AMI Bridge action could deal with it correctly.

  * Made bridge_call_thread_launch() hangup the passed in channels if the
  bridge_call_thread fails to start.  Those channels would have been
  orphaned.

  * Made builtin_atxfer() check the success of the transfer masquerade
  setup.
  ........

  Merged revisions 369282 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@369294 65c4cc65-6c06-0410-ace0-fbb531ad65f3
main/features.c