diff options
| author | Joshua Colp <jcolp@digium.com> | 2006-10-05 19:58:50 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2006-10-05 19:58:50 +0000 |
| commit | 3dd0ce45fd09af592c6420b583740341227e09f8 (patch) | |
| tree | 7cf26167edd35fa0b17408b13e8063c46332e4f2 /main | |
| parent | 6f34a8d78d7d83740574a335360796565a3f4596 (diff) | |
Merged revisions 44502 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r44502 | file | 2006-10-05 15:57:16 -0400 (Thu, 05 Oct 2006) | 10 lines
Merged revisions 44501 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r44501 | file | 2006-10-05 15:55:41 -0400 (Thu, 05 Oct 2006) | 2 lines
Treat busy control frames as hangup in the file streaming core (issue #8097 reported by eldadran)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44503 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/file.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/main/file.c b/main/file.c index 412bb0f3f..d5298bb03 100644 --- a/main/file.c +++ b/main/file.c @@ -1054,6 +1054,7 @@ static int waitstream_core(struct ast_channel *c, const char *breakon, case AST_FRAME_CONTROL: switch(fr->subclass) { case AST_CONTROL_HANGUP: + case AST_CONTROL_BUSY: ast_frfree(fr); return -1; case AST_CONTROL_RINGING: |