From 3dd0ce45fd09af592c6420b583740341227e09f8 Mon Sep 17 00:00:00 2001 From: Joshua Colp <jcolp@digium.com> Date: Thu, 5 Oct 2006 19:58:50 +0000 Subject: [PATCH] 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 --- main/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/main/file.c b/main/file.c index 412bb0f3f6..d5298bb033 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: -- GitLab