[svn-commits] file: trunk r44503 - in /trunk: ./ main/file.c

[svn-commits at lists.digium.com]

Author: file
Date: Thu Oct  5 14:58:50 2006
New Revision: 44503

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

........

................

Modified:
    trunk/   (props changed)
    trunk/main/file.c

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

Modified: trunk/main/file.c
URL: http://svn.digium.com/view/asterisk/trunk/main/file.c?rev=44503&r1=44502&r2=44503&view=diff
==============================================================================
--- trunk/main/file.c (original)
+++ trunk/main/file.c Thu Oct  5 14:58:50 2006
@@ -1054,6 +1054,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: