[svn-commits] russell: branch 1.6.0 r110501 - in /branches/1.6.0: ./ configs/

[SVN commits to the Digium repositories]

Author: russell
Date: Fri Mar 21 10:25:06 2008
New Revision: 110501

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

........
r110499 | russell | 2008-03-21 10:24:43 -0500 (Fri, 21 Mar 2008) | 3 lines

Note that the TCP and TLS support is currently considered experimental and
is subject to change while we work out the remaining issues.

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/CHANGES
    branches/1.6.0/configs/sip.conf.sample

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/CHANGES
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/CHANGES?view=diff&rev=110501&r1=110500&r2=110501
==============================================================================
--- branches/1.6.0/CHANGES (original)
+++ branches/1.6.0/CHANGES Fri Mar 21 10:25:06 2008
@@ -149,8 +149,8 @@
   * Added SIP Session Timers support (RFC 4028).  This prevents stuck SIP sessions that
      were not properly torn down due to network or endpoint failures during an established
      SIP session.
-  * Added TCP and TLS support for SIP.  See doc/siptls.txt and configs/sip.conf.sample for
-     more information on how it is used.
+  * Added experimental TCP and TLS support for SIP.  See doc/siptls.txt and 
+     configs/sip.conf.sample for more information on how it is used.
 
 IAX2 changes
 ------------

Modified: branches/1.6.0/configs/sip.conf.sample
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configs/sip.conf.sample?view=diff&rev=110501&r1=110500&r2=110501
==============================================================================
--- branches/1.6.0/configs/sip.conf.sample (original)
+++ branches/1.6.0/configs/sip.conf.sample Fri Mar 21 10:25:06 2008
@@ -80,6 +80,12 @@
 				; bindport is the local UDP port that Asterisk will listen on
 bindaddr=0.0.0.0		; IP address to bind to (0.0.0.0 binds to all)
 
+;
+; Note that the TCP and TLS support for chan_sip is currently considered
+; experimental.  Since it is new, all of the related configuration options are
+; subject to change in any release.  If they are changed, the changes will
+; be reflected in this sample configuration file, as well as in the UPGRADE.txt file.
+;
 tcpenable=yes                   ; Enable server for incoming TCP connections (default is yes)
 tcpbindaddr=0.0.0.0	        ; IP address for TCP server to bind to (0.0.0.0 binds to all interfaces)
                                 ; Optionally add a port number, 192.168.1.1:5062 (default is port 5060)