aboutsummaryrefslogtreecommitdiffstats
path: root/main/file.c
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2006-10-05 19:57:16 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2006-10-05 19:57:16 +0000
commitb97375bc72d01557442ed5e13539c1a8562670c6 (patch)
treefcd7ff0e919219dc673516d195b858a8082e77e8 /main/file.c
parent69d8d2d8275b0a0827d291335926d02b0596fe83 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.4@44502 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/file.c')
-rw-r--r--main/file.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/main/file.c b/main/file.c
index 180133dc2..20c68cf84 100644
--- a/main/file.c
+++ b/main/file.c
@@ -1051,6 +1051,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: