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
  ........
................


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

channels/chan_sip.c

@@ -651,7 +651,7 @@ static const struct cfsip_options {
 	\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 
 	\note This should be generated based on the previous array