[svn-commits] lmadsen: branch 1.6.1 r226386 - /branches/1.6.1/configs/sip.conf.sample

[SVN commits to the Digium repositories]

Author: lmadsen
Date: Wed Oct 28 15:15:51 2009
New Revision: 226386

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=226386
Log:
Merged revisions 226384 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r226384 | lmadsen | 2009-10-28 15:11:07 -0500 (Wed, 28 Oct 2009) | 17 lines
  
  Merged revisions 226382 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r226382 | lmadsen | 2009-10-28 15:06:13 -0500 (Wed, 28 Oct 2009) | 9 lines
    
    Update documentation in sip.conf.sample.
    
    Update the documentation in sip.conf.sample in order to make it more clear
    that directmedia/canreinvite do not cause Asterisk to ignore reINVITEs. It
    is only used to stop Asterisk from generating a reINVITE, but does not stop
    it from accepting them if necessary.
    
    (closes issue #15644)
    Reported by: lmadsen
  ........
................

Modified:
    branches/1.6.1/configs/sip.conf.sample

Modified: branches/1.6.1/configs/sip.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/configs/sip.conf.sample?view=diff&rev=226386&r1=226385&r2=226386
==============================================================================
--- branches/1.6.1/configs/sip.conf.sample (original)
+++ branches/1.6.1/configs/sip.conf.sample Wed Oct 28 15:15:51 2009
@@ -640,6 +640,13 @@
                                 ; RTP payloads and fmtp headers in the 200 OK that does not match the
                                 ; callers INVITE. This will also fail if canreinvite is enabled when
                                 ; the device is actually behind NAT.
+
+                                ; Additionally this option does not disable all reINVITE operations.
+                                ; It only controls Asterisk generating reINVITEs for the specific
+                                ; purpose of setting up a direct media path. If a reINVITE is
+                                ; needed to switch a media stream to inactive (when placed on
+                                ; hold) or to T.38, it will still be done, regardless of this 
+                                ; setting.
 
 ;canreinvite=nonat              ; An additional option is to allow media path redirection
                                 ; (reinvite) but only when the peer where the media is being