aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2005-11-01 20:29:36 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2005-11-01 20:29:36 +0000
commit130a622723a0442a2db5390b86a42456521dbb09 (patch)
treee7bfad7fc85e7d58f03298afb5c2873170660bbc
parent013b837832bc7093633dc4e0ed2ca562f68999c9 (diff)
issue #5499
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6931 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-xChangeLog2
-rwxr-xr-xres/res_features.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4fa546cbc..f074fd70a 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2005-11-01 Kevin P. Fleming <kpfleming@digium.com>
+ * res/res_features.c (ast_feature_request_and_dial): ensure that channel variables are inherited from the channel placing the call (issue #5499)
+
* utils.c (getloadavg): change to using _BSD_SOURCE as the indicator for whether this function is present or not (issue #5549)
* include/asterisk/utils.h (ast_slinear_saturated_add): force to be inlined whenever possible
diff --git a/res/res_features.c b/res/res_features.c
index 2d1f852fe..b973da595 100755
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -1087,7 +1087,7 @@ static struct ast_channel *ast_feature_request_and_dial(struct ast_channel *call
if ((chan = ast_request(type, format, data, &cause))) {
ast_set_callerid(chan, cid_num, cid_name, cid_num);
-
+ ast_channel_inherit_variables(caller, chan);
if (!ast_call(chan, data, timeout)) {
struct timeval started;
int x, len = 0;