diff options
| -rw-r--r-- | main/uri.c | 6 | ||||
| -rw-r--r-- | tests/test_websocket_client.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/main/uri.c b/main/uri.c index 6642d843b..be1136fe6 100644 --- a/main/uri.c +++ b/main/uri.c @@ -229,6 +229,8 @@ struct ast_uri *ast_uri_parse(const char *uri) if ((p = strchr(uri, '?'))) { query = p + 1; size_query = strlen(query) + 1; + } else { + p = uri + strlen(uri); } if (!host) { @@ -313,9 +315,9 @@ char *ast_uri_make_host_with_port(const struct ast_uri *uri) if (ast_uri_port(uri)) { res[host_size] = ':'; memcpy(res + host_size + 1, - ast_uri_port(uri), port_size); + ast_uri_port(uri), port_size - 1); } - res[host_size + port_size + 1] = '\0'; + res[host_size + port_size] = '\0'; return res; } diff --git a/tests/test_websocket_client.c b/tests/test_websocket_client.c index e104ed825..726ee1cfc 100644 --- a/tests/test_websocket_client.c +++ b/tests/test_websocket_client.c @@ -41,7 +41,7 @@ ASTERISK_FILE_VERSION(__FILE__, "") #include "asterisk/http_websocket.h" #define CATEGORY "/res/websocket/" -#define REMOTE_URL "ws://localhost:8088/ws" +#define REMOTE_URL "ws://127.0.0.1:8088/ws" AST_TEST_DEFINE(websocket_client_create_and_connect) { |