Merged revisions 283493 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r283493 | dvossel | 2010-08-24 15:34:03 -0500 (Tue, 24 Aug 2010) | 2 lines

  Changes the default behavior for sip.conf's pedantic option from "no" to "yes".
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@283494 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/UPGRADE-1.8.txt b/UPGRADE-1.8.txt
index 9202cfb10693e16bd7c9a2431554e0afaf788d61..9889a55e6a1f82c470eacc146001229cb6f4d9a9 100644 (file)
--- a/UPGRADE-1.8.txt
+++ b/UPGRADE-1.8.txt
@@ -114,6 +114,9 @@ From 1.6.2 to 1.8:
   removal of this feature will hopefully be followed by a correct RFC compliant
   STUN implementation in chan_sip in the future.
 
+* The default value for the pedantic option in sip.conf has been changed
+  from "no" to "yes".
+
 From 1.6.1 to 1.6.2:
 
 * SIP no longer sends the 183 progress message for early media by

diff --git a/channels/sip/include/sip.h b/channels/sip/include/sip.h
index cf3c0da6966693bcca9cdb16e210614c4d3aed1b..11996f690adc657b16c6e565c8f7cbfa8dc65a03 100644 (file)
--- a/channels/sip/include/sip.h
+++ b/channels/sip/include/sip.h
@@ -209,7 +209,7 @@
 #define DEFAULT_DOMAINSASREALM FALSE    /*!< Use the domain option to guess the realm for registration and invite requests */
 #define DEFAULT_NOTIFYRINGING  TRUE     /*!< Notify devicestate system on ringing state */
 #define DEFAULT_NOTIFYCID      DISABLED        /*!< Include CID with ringing notifications */
-#define DEFAULT_PEDANTIC       FALSE    /*!< Avoid following SIP standards for dialog matching */
+#define DEFAULT_PEDANTIC       TRUE     /*!< Follow SIP standards for dialog matching */
 #define DEFAULT_AUTOCREATEPEER FALSE    /*!< Don't create peers automagically */
 #define        DEFAULT_MATCHEXTERNADDRLOCALLY FALSE /*!< Match extern IP locally default setting */
 #define DEFAULT_QUALIFY        FALSE    /*!< Don't monitor devices */

diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index 287e3c52be76da3e8d0467d35215847e609346e4..b0c7e8d3286b49d3bada262bdbc54290017caecb 100644 (file)
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -215,7 +215,7 @@ srvlookup=yes                   ; Enable DNS SRV lookups on outbound calls
 ;pedantic=yes                   ; Enable checking of tags in headers,
                                 ; international character conversions in URIs
                                 ; and multiline formatted headers for strict
-                                ; SIP compatibility (defaults to "no")
+                                ; SIP compatibility (defaults to "yes")
 
 ; See qos.tex or Quality of Service section of asterisk.pdf for a description of these parameters.
 ;tos_sip=cs3                    ; Sets TOS for SIP packets.