kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 03:04:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 220288 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r220288 | tilghman | 2009-09-24 14:39:41 -0500 (Thu, 24 Sep 2009) | 6 lines
  
  Implicitly sending a progress signal breaks some applications.
  Call Progress() in your dialplan if you explicitly want progress to be sent.
  (Reverts change 216430, closes issue #15957)
  Reported by: Pavel Troller on the Asterisk-Dev mailing list
  http://lists.digium.com/pipermail/asterisk-dev/2009-September/039897.html
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@220289 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-09-24 19:41:02 +00:00
parent a662c95371
commit 1cf5422dc8
3 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/app_disa.c
View File

@@ -187,12 +187,7 @@ static int disa_exec(struct ast_channel *chan, const char *data)
/* answer */
ast_answer(chan);
}
} else {
special_noanswer = 1;
if (chan->_state != AST_STATE_UP) {
ast_indicate(chan, AST_CONTROL_PROGRESS);
}
}
} else special_noanswer = 1;
ast_debug(1, "Context: %s\n",args.context);

3
apps/app_playback.c
View File

@@ -452,10 +452,7 @@ static int playback_exec(struct ast_channel *chan, const char *data)
} else if (!option_noanswer) {
/* Otherwise answer unless we're supposed to send this while on-hook */
res = ast_answer(chan);
} else {
ast_indicate(chan, AST_CONTROL_PROGRESS);
}
}
if (!res) {
char *back = args.filenames;

2
main/pbx.c
View File

@@ -9126,8 +9126,6 @@ static int pbx_builtin_background(struct ast_channel *chan, const char *data)
} else if (!ast_test_flag(&flags, BACKGROUND_NOANSWER)) {
res = ast_answer(chan);
}
/* Send progress control frame to start early media */
ast_indicate(chan, AST_CONTROL_PROGRESS);
}
if (!res) {