Skip to content
Snippets Groups Projects
Commit a260cee5 authored by Matt Jordan's avatar Matt Jordan Committed by Gerrit Code Review
Browse files

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

parents 2d20379f 59253a22
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
res/res_http_websocket.c
+ 1
− 1
View file @ a260cee5
...@@ -209,7 +209,6 @@ int AST_OPTIONAL_API_NAME(ast_websocket_server_add_protocol)(struct ast_websocke ...@@ -209,7 +209,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;
...@@ -840,6 +839,7 @@ int AST_OPTIONAL_API_NAME(ast_websocket_uri_cb)(struct ast_tcptls_session_instan ...@@ -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)) { && 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_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;
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment