]> git.ipfire.org Git - thirdparty/asterisk.git/commit
Merged revisions 277657 via svnmerge from
authorTim Ringenbach <tim.ringenbach@gmail.com>
Fri, 16 Jul 2010 23:37:28 +0000 (23:37 +0000)
committerTim Ringenbach <tim.ringenbach@gmail.com>
Fri, 16 Jul 2010 23:37:28 +0000 (23:37 +0000)
commit77f0fd5d471c00f1dde754bccdff6064fa0fab9b
tree20fa43ffa1259885a0bc01f74acb8fda0dba4782
parentb154448f19f9d390f2cad9dc13a79672c50f157e
Merged revisions 277657 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r277657 | tringenbach | 2010-07-16 18:23:15 -0500 (Fri, 16 Jul 2010) | 16 lines

  Merged revisions 277625 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r277625 | tringenbach | 2010-07-16 17:43:39 -0500 (Fri, 16 Jul 2010) | 9 lines

    Save and restore AST_FLAG_BRIDGE_HANGUP_DONT on attended transfer.

    ast_bridge_call() clears AST_FLAG_BRIDGE_HANGUP_DONT. But during an attended
    transfer, ast_bridge_call() is called for a second bridge on the same channel,
    and it clears that flag, which still needs to get set for when the original
    ast_bridge_call() gets control back and checks it.

    Review: https://reviewboard.asterisk.org/r/741
  ........
................

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