kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 04:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_ari: Correct Location headers returned by some ARI resources

Browse Source 
The Location headers returned by:

 * /bridges/{bridgeId}/play
 * /bridges/{bridgeId}/record
 * /channels/{channelId}/play
 * /channels/{channelId}/record

Did not have the '/ari' prefix, and in the case of the 'play' resources, were
using 'playback' instead of 'playbacks.'

Change-Id: I957c58a3a1471bf477dae7c67faa1b74fcd9241c
This commit is contained in:
Sean Bright
2016-05-14 13:29:09 -04:00
parent d9c5882e69
commit 14938184a3
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/ari/resource_bridges.c
View File

@@ -380,7 +380,7 @@ static int ari_bridges_play_helper(const char *args_media,
return -1; return -1;
} }
if (ast_asprintf(playback_url, "/playback/%s", if (ast_asprintf(playback_url, "/playbacks/%s",
stasis_app_playback_get_id(playback)) == -1) { stasis_app_playback_get_id(playback)) == -1) {
playback_url = NULL; playback_url = NULL;
ast_ari_response_alloc_failed(response); ast_ari_response_alloc_failed(response);

2
res/ari/resource_channels.c
View File

@@ -524,7 +524,7 @@ static void ari_channels_handle_play(
return; return;
} }
if (ast_asprintf(&playback_url, "/playback/%s", if (ast_asprintf(&playback_url, "/playbacks/%s",
stasis_app_playback_get_id(playback)) == -1) { stasis_app_playback_get_id(playback)) == -1) {
playback_url = NULL; playback_url = NULL;
ast_ari_response_error( ast_ari_response_error(

3
res/res_ari.c
View File

@@ -304,10 +304,11 @@ void ast_ari_response_alloc_failed(struct ast_ari_response *response)
void ast_ari_response_created(struct ast_ari_response *response, void ast_ari_response_created(struct ast_ari_response *response,
const char *url, struct ast_json *message) const char *url, struct ast_json *message)
{ {
RAII_VAR(struct stasis_rest_handlers *, root, get_root_handler(), ao2_cleanup);
response->message = message; response->message = message;
response->response_code = 201; response->response_code = 201;
response->response_text = "Created"; response->response_text = "Created";
ast_str_append(&response->headers, 0, "Location: %s\r\n", url); ast_str_append(&response->headers, 0, "Location: /%s%s\r\n", root->path_segment, url);
} }
static void add_allow_header(struct stasis_rest_handlers *handler, static void add_allow_header(struct stasis_rest_handlers *handler,