summaryrefslogtreecommitdiff
path: root/res/res_http_websocket.c
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2015-08-18 16:06:54 -0500
committerRichard Mudgett <rmudgett@digium.com>2015-08-18 16:38:19 -0500
commit59253a22623ff82cb382c633877d44636d2bda77 (patch)
treef21319251f1d7bd27049b72798e7d25c0548be6a /res/res_http_websocket.c
parent1f0a9f8a76f74e1b87a64fb61bdedc6aec90ddf5 (diff)
res_http_websocket.c: Fix some off nominal path cleanup.
* Remove extraneous unlock on off-nominal path. * Add missing HTTP error reply. Change-Id: I1f402bfe448fba8696b507477cab5f060ccd9b2b
Diffstat (limited to 'res/res_http_websocket.c')
-rw-r--r--res/res_http_websocket.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_http_websocket.c b/res/res_http_websocket.c
index a29daa8ff..86ec00cce 100644
--- a/res/res_http_websocket.c
+++ b/res/res_http_websocket.c
@@ -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;
}