From: Joshua Colp <jcolp@digium.com>
Date: Thu, 30 Nov 2006 19:06:22 +0000 (+0000)
Subject: Merged revisions 48155 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~3821
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d72171b6e47c1ddba89c0a5c4ae18e0ec5af07a5;p=thirdparty%2Fasterisk.git

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

................
r48155 | file | 2006-11-30 14:05:14 -0500 (Thu, 30 Nov 2006) | 10 lines

Merged revisions 48154 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r48154 | file | 2006-11-30 14:04:11 -0500 (Thu, 30 Nov 2006) | 2 lines

Do not listen for DTMF on the bridge that comes into existence when ParkedCall is executed. This means native bridging can now occur for this. (issue #8406 reported by kebl0155)

........

................


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

diff --git a/res/res_features.c b/res/res_features.c
index 485dcbc19f..fa17f55d8d 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -1828,12 +1828,6 @@ static int park_exec(struct ast_channel *chan, void *data)
 			ast_verbose(VERBOSE_PREFIX_3 "Channel %s connected to parked call %d\n", chan->name, park);
 
 		memset(&config, 0, sizeof(struct ast_bridge_config));
-		ast_set_flag(&(config.features_callee), AST_FEATURE_REDIRECT);
-		ast_set_flag(&(config.features_caller), AST_FEATURE_REDIRECT);
-		config.timelimit = 0;
-		config.play_warning = 0;
-		config.warning_freq = 0;
-		config.warning_sound=NULL;
 		res = ast_bridge_call(chan, peer, &config);
 
 		/* Simulate the PBX hanging up */