[asterisk-commits] coreyfarrell: branch 13 r427201 - in /branches/13: ./ res/res_http_websocket.c

[SVN commits to the Asterisk project]

Author: coreyfarrell
Date: Tue Nov  4 13:32:21 2014
New Revision: 427201

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=427201
Log:
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

Modified:
    branches/13/   (props changed)
    branches/13/res/res_http_websocket.c

Propchange: branches/13/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: branches/13/res/res_http_websocket.c
URL: http://svnview.digium.com/svn/asterisk/branches/13/res/res_http_websocket.c?view=diff&rev=427201&r1=427200&r2=427201
==============================================================================
--- branches/13/res/res_http_websocket.c (original)
+++ branches/13/res/res_http_websocket.c Tue Nov  4 13:32:21 2014
@@ -1292,7 +1292,7 @@
 
 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;