[svn-commits] jrose: trunk r357503 - in /trunk: ./ UPGRADE-1.8.txt configs/sip.conf.sample

[SVN commits to the Digium repositories]

Author: jrose
Date: Tue Feb 28 16:31:24 2012
New Revision: 357503

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=357503
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
........

Merged revisions 357497 from http://svn.asterisk.org/svn/asterisk/branches/10

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

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

Modified: trunk/UPGRADE-1.8.txt
URL: http://svnview.digium.com/svn/asterisk/trunk/UPGRADE-1.8.txt?view=diff&rev=357503&r1=357502&r2=357503
==============================================================================
--- trunk/UPGRADE-1.8.txt (original)
+++ trunk/UPGRADE-1.8.txt Tue Feb 28 16:31:24 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: trunk/configs/sip.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/sip.conf.sample?view=diff&rev=357503&r1=357502&r2=357503
==============================================================================
--- trunk/configs/sip.conf.sample (original)
+++ trunk/configs/sip.conf.sample Tue Feb 28 16:31:24 2012
@@ -228,6 +228,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