[svn-commits] mnicholson: trunk r334158 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: mnicholson
Date: Wed Aug 31 13:54:33 2011
New Revision: 334158

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=334158
Log:
Merged revisions 334157 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r334157 | mnicholson | 2011-08-31 13:53:40 -0500 (Wed, 31 Aug 2011) | 11 lines
  
  Merged revisions 334156 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r334156 | mnicholson | 2011-08-31 13:50:33 -0500 (Wed, 31 Aug 2011) | 4 lines
    
    Disable T.38 when we get a invite with image media port set to 0
    
    ASTERISK-17678
  ........
................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

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

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=334158&r1=334157&r2=334158
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Aug 31 13:54:33 2011
@@ -9221,6 +9221,7 @@
 				}
 			}
 		} else {
+			change_t38_state(p, T38_DISABLED);
 			ast_udptl_stop(p->udptl);
 			if (debug)
 				ast_debug(1, "Peer doesn't provide T.38 UDPTL\n");