From d97dda53b0d796cde87328dafe97e9da3bd360a0 Mon Sep 17 00:00:00 2001 From: dvossel Date: Wed, 25 Aug 2010 15:56:05 +0000 Subject: Merged revisions 283559 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r283559 | dvossel | 2010-08-25 10:54:11 -0500 (Wed, 25 Aug 2010) | 16 lines Merged revisions 283558 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r283558 | dvossel | 2010-08-25 10:52:54 -0500 (Wed, 25 Aug 2010) | 10 lines Asterisk will not advertise session timers are supported when 'session-timers=refuse' is used. Asterisk now dynamically builds the "Supported" header depending on what is enabled/disabled in sip.conf. Session timers used to always be advertised as being supported even when they were disabled in the configuration. This caused problems with some end points. (issue #17005) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@283560 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/sip/include/sip.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'channels/sip/include') diff --git a/channels/sip/include/sip.h b/channels/sip/include/sip.h index 11996f690..9fa37a4d4 100644 --- a/channels/sip/include/sip.h +++ b/channels/sip/include/sip.h @@ -154,14 +154,6 @@ */ #define ALLOWED_METHODS "INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, PUBLISH" -/*! \brief SIP Extensions we support - * \note This should be generated based on the previous array - * in combination with settings. - * - * \todo We should not have "timer" if it's disabled in the configuration file. - */ -#define SUPPORTED_EXTENSIONS "replaces, timer" - /*! \brief Standard SIP unsecure port for UDP and TCP from RFC 3261. DO NOT CHANGE THIS */ #define STANDARD_SIP_PORT 5060 /*! \brief Standard SIP TLS port from RFC 3261. DO NOT CHANGE THIS */ -- cgit v1.2.3