[svn-commits] file: branch 1.4 r44502 - in /branches/1.4: ./ main/file.c

[svn-commits at lists.digium.com]

Author: file
Date: Thu Oct  5 14:57:16 2006
New Revision: 44502

URL: http://svn.digium.com/view/asterisk?rev=44502&view=rev
Log:
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)

........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/main/file.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/main/file.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/file.c?rev=44502&r1=44501&r2=44502&view=diff
==============================================================================
--- branches/1.4/main/file.c (original)
+++ branches/1.4/main/file.c Thu Oct  5 14:57:16 2006
@@ -1051,6 +1051,7 @@
 			case AST_FRAME_CONTROL:
 				switch(fr->subclass) {
 				case AST_CONTROL_HANGUP:
+				case AST_CONTROL_BUSY:
 					ast_frfree(fr);
 					return -1;
 				case AST_CONTROL_RINGING: