automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@37253 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channel.c b/channel.c
index 3aa88130d57a3c62379fda95f6943071f199d65e..1f5f5960523955b2decfc2609b7e0baacf7c99a2 100644 (file)
--- a/channel.c
+++ b/channel.c
@@ -3483,7 +3483,8 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha
                    (config->timelimit == 0) &&
                    (c0->tech->bridge == c1->tech->bridge) &&
                    !nativefailed && !c0->monitor && !c1->monitor &&
-                   !c0->spies && !c1->spies) {
+                   !c0->spies && !c1->spies && !ast_test_flag(&(config->features_callee),AST_FEATURE_REDIRECT) &&
+                   !ast_test_flag(&(config->features_caller),AST_FEATURE_REDIRECT) ) {
                        /* Looks like they share a bridge method and nothing else is in the way */
                        if (option_verbose > 2) 
                                ast_verbose(VERBOSE_PREFIX_3 "Attempting native bridge of %s and %s\n", c0->name, c1->name);