sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Matt Jordan 2015-08-19 08:42:56 -05:00 committed by Gerrit Code Review
parent 2d20379f8e 59253a2262
commit a260cee5cb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/res_http_websocket.c
View File

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