From 40574a2ea31f03d5a4d3914f1e20895a9b49d7f0 Mon Sep 17 00:00:00 2001 From: Corey Farrell Date: Mon, 2 Nov 2015 21:24:58 -0500 Subject: 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 --- CHANGES | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'CHANGES') 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. -- cgit v1.2.3