[svn-commits] jrose: branch 10 r357497 - in /branches/10: ./ configs/

[SVN commits to the Digium repositories]

Author: jrose
Date: Tue Feb 28 16:29:47 2012
New Revision: 357497

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=357497
Log:
Adding transport=udp to sample sip.conf - Also changes version of Asterisk 1.8 in UPGRADE

(issue ASTERISK-19352)
Reported by: jamicque
Patches:
	asterisk-19352-transport-warning-message-v1.patch uploaded by Michael L. Young (license 5026)
........

Merged revisions 357490 from http://svn.asterisk.org/svn/asterisk/branches/1.8

Modified:
    branches/10/   (props changed)
    branches/10/UPGRADE-1.8.txt
    branches/10/configs/sip.conf.sample

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

Modified: branches/10/UPGRADE-1.8.txt
URL: http://svnview.digium.com/svn/asterisk/branches/10/UPGRADE-1.8.txt?view=diff&rev=357497&r1=357496&r2=357497
==============================================================================
--- branches/10/UPGRADE-1.8.txt (original)
+++ branches/10/UPGRADE-1.8.txt Tue Feb 28 16:29:47 2012
@@ -18,7 +18,7 @@
 ===
 ===========================================================
 
-from 1.8.11 to 1.8.12:
+From 1.8.10 to 1.8.11:
 
 * If no transport is specified in sip.conf, transport will default to UDP.
   Also, if multiple transport= lines are used, only the last will be used.

Modified: branches/10/configs/sip.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/10/configs/sip.conf.sample?view=diff&rev=357497&r1=357496&r2=357497
==============================================================================
--- branches/10/configs/sip.conf.sample (original)
+++ branches/10/configs/sip.conf.sample Tue Feb 28 16:29:47 2012
@@ -218,6 +218,9 @@
 ;tcpauthlimit = 100             ; tcpauthlimit specifies the maximum number of
 				; unauthenticated sessions that will be allowed
                                 ; to connect at any given time. (default: 100)
+
+transport=udp                   ; Set the default transports.  The order determines the primary default transport.
+                                ; If tcpenable=no and the transport set is tcp, we will fallback to UDP.
 
 srvlookup=yes                   ; Enable DNS SRV lookups on outbound calls
                                 ; Note: Asterisk only uses the first host