From: Corey Farrell <git@cfware.com>
Date: Tue, 4 Nov 2014 19:33:21 +0000 (+0000)
Subject: res_http_websockets: Fix extra unref of module
X-Git-Tag: 14.0.0-beta1~1494
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f2874639d039306d66804a90436a3c5f9ee07ee;p=thirdparty%2Fasterisk.git

res_http_websockets: Fix extra unref of module

In websocket_add_protocol_internal is used to add the "echo"
protocol, but ast_websocket_remove_protocol is used to remove
it.  This causes an extra call to ast_module_unref.

ASTERISK-24480 #close
Reported by: Corey Farrell
Review: https://reviewboard.asterisk.org/r/4140/
........

Merged revisions 427200 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 427201 from http://svn.asterisk.org/svn/asterisk/branches/13


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

diff --git a/res/res_http_websocket.c b/res/res_http_websocket.c
index ca144b0d4f..e47bcd2310 100644
--- a/res/res_http_websocket.c
+++ b/res/res_http_websocket.c
@@ -1292,7 +1292,7 @@ static int load_module(void)
 
 static int unload_module(void)
 {
-	ast_websocket_remove_protocol("echo", websocket_echo_callback);
+	websocket_remove_protocol_internal("echo", websocket_echo_callback);
 	ast_http_uri_unlink(&websocketuri);
 	ao2_ref(websocketuri.data, -1);
 	websocketuri.data = NULL;