diff options
| author | Matt Jordan <mjordan@digium.com> | 2015-08-19 08:42:56 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2015-08-19 08:42:56 -0500 |
| commit | a260cee5cb82d0129847fb2afa3e9818b1b62393 (patch) | |
| tree | 2547f6a7272c8ea673f7aff1495fdf6aaf7b41a9 | |
| parent | 2d20379f8e5b3ca26678d2538104f0a35f87e12f (diff) | |
| parent | 59253a22623ff82cb382c633877d44636d2bda77 (diff) | |
Merge "res_http_websocket.c: Fix some off nominal path cleanup."
| -rw-r--r-- | res/res_http_websocket.c | 2 |
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; } |