[asterisk-commits] mmichelson: branch 1.6.0 r200515 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon Jun 15 10:22:34 2009
New Revision: 200515

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=200515
Log:
Merged revisions 200514 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r200514 | mmichelson | 2009-06-15 10:22:11 -0500 (Mon, 15 Jun 2009) | 11 lines
  
  Merged revisions 200513 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r200513 | mmichelson | 2009-06-15 10:21:46 -0500 (Mon, 15 Jun 2009) | 5 lines
    
    Add INFO to our allowed methods so that endpoints know they may send it to us.
    
    AST-223
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c

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

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=200515&r1=200514&r2=200515
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Mon Jun 15 10:22:34 2009
@@ -583,7 +583,7 @@
 	\todo This string should be set dynamically. We only support REFER and SUBSCRIBE is we have
 	allowsubscribe and allowrefer on in sip.conf.
 */
-#define ALLOWED_METHODS "INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY"
+#define ALLOWED_METHODS "INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO"
 
 /*! \brief SIP Extensions we support */
 #define SUPPORTED_EXTENSIONS "replaces, timer"