[svn-commits] lmadsen: trunk r226384 - in /trunk: ./ configs/sip.conf.sample

[SVN commits to the Digium repositories]

Author: lmadsen
Date: Wed Oct 28 15:11:07 2009
New Revision: 226384

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=226384
Log:
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:
    trunk/   (props changed)
    trunk/configs/sip.conf.sample

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

Modified: trunk/configs/sip.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/sip.conf.sample?view=diff&rev=226384&r1=226383&r2=226384
==============================================================================
--- trunk/configs/sip.conf.sample (original)
+++ trunk/configs/sip.conf.sample Wed Oct 28 15:11:07 2009
@@ -730,6 +730,13 @@
                                 ; at call setup (a new feature in 1.4 - setting up the
                                 ; call directly between the endpoints instead of sending
                                 ; a re-INVITE).
+
+                                ; 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.
 
 ;directmedia=nonat              ; An additional option is to allow media path redirection
                                 ; (reinvite) but only when the peer where the media is being