diff options
author | Steve Murphy <murf@digium.com> | 2007-05-02 17:24:03 +0000 |
---|---|---|
committer | Steve Murphy <murf@digium.com> | 2007-05-02 17:24:03 +0000 |
commit | fe7068a51bc9b1f33e1cd46c29c8113da6b2704d (patch) | |
tree | b0bec7068847eb3fa1e8a42df3835ad07d197f48 /main/pbx.c | |
parent | 3d409eb793d0cba852dbaa42dc9b0e6d8fb805d0 (diff) |
Merged revisions 62689 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r62689 | murf | 2007-05-02 11:10:50 -0600 (Wed, 02 May 2007) | 1 line
a)In chan_zap, set the clid, src fields in channel_alloc call. b)in the channel_alloc func, set the cid_num and name fields from the arglist[blush]. c) don't update the channel app & app data fields if you are in the 'h' extension. d)the load_module func in cdr_radius needs to return DECLINE, SUCCESS.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62690 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/pbx.c')
-rw-r--r-- | main/pbx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/pbx.c b/main/pbx.c index 5f3f77b16..edb3d1ba7 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -515,7 +515,7 @@ int pbx_exec(struct ast_channel *c, /*!< Channel */ const char *saved_c_appl; const char *saved_c_data; - if (c->cdr) + if (c->cdr && !(c->exten[0] == 'h' && c->exten[1] == 0) ) ast_cdr_setapp(c->cdr, app->name, data); /* save channel values */ |