Merge "res_http_websocket.c: Fix some off nominal path cleanup."
This commit is contained in:
commit
a260cee5cb
1 changed files with 1 additions and 1 deletions
|
@ -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
|
||||||
&& 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;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue