From: Joshua Colp <jcolp@digium.com>
Date: Thu, 5 Oct 2006 19:58:50 +0000 (+0000)
Subject: Merged revisions 44502 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~4504
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3dd0ce45fd09af592c6420b583740341227e09f8;p=thirdparty%2Fasterisk.git

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
---

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: