Merged revisions 237406 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r237406 | tilghman | 2010-01-04 12:28:28 -0600 (Mon, 04 Jan 2010) | 23 lines
  
  Merged revisions 237405 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r237405 | tilghman | 2010-01-04 12:19:00 -0600 (Mon, 04 Jan 2010) | 16 lines
    
    Add a flag to disable the Background behavior, for AGI users.
    This is in a section of code that relates to two other issues, namely
    issue #14011 and issue #14940), one of which was the behavior of
    Background when called with a context argument that matched the current
    context.  This fix broke FreePBX, however, in a post-Dial situation.
    Needless to say, this is an extremely difficult collision of several
    different issues.  While the use of an exception flag is ugly, fixing all
    of the issues linked is rather difficult (although if someone would like
    to propose a better solution, we're happy to entertain that suggestion).
    (closes issue #16434)
     Reported by: rickead2000
     Patches: 
           20091217__issue16434.diff.txt uploaded by tilghman (license 14)
           20091222__issue16434__1.6.1.diff.txt uploaded by tilghman (license 14)
     Tested by: rickead2000
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@237408 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-01-04 18:30:44 +00:00
parent 28800a8ed1
commit b5e1442f4c
3 changed files with 20 additions and 5 deletions

View File

@@ -564,6 +564,10 @@ enum {
AST_FLAG_BRIDGE_HANGUP_DONT = (1 << 18),
/*! This flag indicates whether the channel is in the channel list or not. */
AST_FLAG_IN_CHANNEL_LIST = (1 << 19),
/*! Disable certain workarounds. This reintroduces certain bugs, but allows
* some non-traditional dialplans (like AGI) to continue to function.
*/
AST_FLAG_DISABLE_WORKAROUNDS = (1 << 20),
};
/*! \brief ast_bridge_config flags */