Merged revisions 44502 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Thu, 5 Oct 2006 19:58:50 +0000 (19:58 +0000)
committerJoshua Colp <jcolp@digium.com>
Thu, 5 Oct 2006 19:58:50 +0000 (19:58 +0000)
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

main/file.c

index 412bb0f..d5298bb 100644 (file)
@@ -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: