kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-20 08:40:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_http_websocket.c: Fix some off nominal path cleanup." into 13

Browse Source
This commit is contained in:
Matt Jordan
2015-08-19 08:43:01 -05:00
committed by Gerrit Code Review
parent e5f5b9f384 77518d5434
commit 1a5e087ecf
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/res_http_websocket.c
View File

@@ -207,7 +207,6 @@ int AST_OPTIONAL_API_NAME(ast_websocket_server_add_protocol)(struct ast_websocke
protocol = ast_websocket_sub_protocol_alloc(name); protocol = ast_websocket_sub_protocol_alloc(name);
if (!protocol) { if (!protocol) {
ao2_unlock(server->protocols);
return -1; return -1;
} }
protocol->session_established = callback; protocol->session_established = callback;
@@ -824,6 +823,7 @@ int AST_OPTIONAL_API_NAME(ast_websocket_uri_cb)(struct ast_tcptls_session_instan
&& protocol_handler->session_attempted(ser, get_vars, headers)) { && protocol_handler->session_attempted(ser, get_vars, headers)) {
ast_debug(3, "WebSocket connection from '%s' rejected by protocol handler '%s'\n", ast_debug(3, "WebSocket connection from '%s' rejected by protocol handler '%s'\n",
ast_sockaddr_stringify(&ser->remote_address), protocol_handler->name); ast_sockaddr_stringify(&ser->remote_address), protocol_handler->name);
websocket_bad_request(ser);
ao2_ref(protocol_handler, -1); ao2_ref(protocol_handler, -1);
return 0; return 0;
} }