[svn-commits] rmudgett: branch rmudgett/misdn_facility r183095 - in /team/rmudgett/misdn_fa...

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Wed Mar 18 18:36:02 2009
New Revision: 183095

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=183095
Log:
Merged revisions 183094 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/team/group/issue8824

................
  r183094 | rmudgett | 2009-03-18 18:33:18 -0500 (Wed, 18 Mar 2009) | 13 lines
  
  Merged revisions 183057 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/trunk
  
  ........
    r183057 | file | 2009-03-18 17:22:56 -0500 (Wed, 18 Mar 2009) | 6 lines
    
    Fix an issue where a T38 control frame would get dropped.
    
    If two channels were bridged together using a generic bridge the T38
    control frame would get passed up instead of being indicated on the
    other channel.
  ........
................

Modified:
    team/rmudgett/misdn_facility/   (props changed)
    team/rmudgett/misdn_facility/main/channel.c

Propchange: team/rmudgett/misdn_facility/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/rmudgett/misdn_facility/
------------------------------------------------------------------------------
--- misdn-facility (original)
+++ misdn-facility Wed Mar 18 18:36:02 2009
@@ -1,1 +1,1 @@
-/team/group/issue8824:1-183092
+/team/group/issue8824:1-183094

Propchange: team/rmudgett/misdn_facility/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Mar 18 18:36:02 2009
@@ -1,1 +1,1 @@
-/trunk:1-183045
+/trunk:1-183093

Modified: team/rmudgett/misdn_facility/main/channel.c
URL: http://svn.digium.com/svn-view/asterisk/team/rmudgett/misdn_facility/main/channel.c?view=diff&rev=183095&r1=183094&r2=183095
==============================================================================
--- team/rmudgett/misdn_facility/main/channel.c (original)
+++ team/rmudgett/misdn_facility/main/channel.c Wed Mar 18 18:36:02 2009
@@ -5012,6 +5012,7 @@
 			case AST_CONTROL_HOLD:
 			case AST_CONTROL_UNHOLD:
 			case AST_CONTROL_VIDUPDATE:
+			case AST_CONTROL_T38:
 			case AST_CONTROL_SRCUPDATE:
 			case AST_CONTROL_CONNECTED_LINE:
 			case AST_CONTROL_REDIRECTING: