summaryrefslogtreecommitdiff
path: root/CHANGES
diff options
context:
space:
mode:
authorCorey Farrell <git@cfware.com>2015-11-02 21:24:58 -0500
committerCorey Farrell <git@cfware.com>2015-11-03 08:53:00 -0500
commit40574a2ea31f03d5a4d3914f1e20895a9b49d7f0 (patch)
tree65d286436b6cedb1a0ab91b30b7ac18867c51d38 /CHANGES
parentf80a0ae49be93c654a1da156d4e1a9858cb3223a (diff)
chan_sip: Allow websockets to be disabled.
This patch adds a new setting "websockets_enabled" to sip.conf. Setting this to false allows chan_sip to be used without causing conflicts with res_pjsip_transport_websocket. ASTERISK-24106 #close Reported by: Andrew Nagy Change-Id: I04fe8c4f2d57b2d7375e0e25826c91a72e93bea7
Diffstat (limited to 'CHANGES')
-rw-r--r--CHANGES7
1 files changed, 7 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 78d5e6b97..7d0b954a8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -200,6 +200,13 @@ Queue
--- Functionality changes from Asterisk 13.6.0 to Asterisk 13.7.0 ------------
------------------------------------------------------------------------------
+chan_sip
+------------------
+ * The websockets_enabled option has been added to the general section of
+ sip.conf. The option is enabled by default to match the previous behavior.
+ The option should be disabled when using res_pjsip_transport_websockets to
+ ensure chan_sip will not conflict with PJSIP websockets.
+
Dialplan Functions
------------------
* The HOLD_INTERCEPT dialplan function now actually exists in the source tree.