kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 02:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_http_media_cache: Cleanup audio format lookup in HTTP requests

Browse Source 
Asterisk first looks at the end of the URL to determine the file
extension of the returned audio, which in many cases will not work
because the URL may end with a query string or a URL fragment. If that
fails, Asterisk then looks at the Content-Type header and then finally
parses the URL to get the extension.

The order has been changed such that we look at the Content-Type
header first, followed by looking for the extension of the parsed
URL. We no longer look at the end of the URL, which was error prone.

ASTERISK-29527 #close

Change-Id: I1e3f83b339ef2b80661704717c23568536511032
This commit is contained in:
Sean Bright
2021-07-23 12:00:00 -04:00
committed by George Joseph
parent ff8ca2c9f1
commit 382143e58e
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
res/res_http_media_cache.c
View File

@@ -171,11 +171,6 @@ static char *file_extension_from_string(const char *str, char *buffer, size_t ca
return NULL;
}
static char *file_extension_from_url(struct ast_bucket_file *bucket_file, char *buffer, size_t capacity)
{
return file_extension_from_string(ast_sorcery_object_get_id(bucket_file), buffer, capacity);
}
/*!
* \internal
* \brief Normalize the value of a Content-Type header
@@ -249,18 +244,13 @@ static char *file_extension_from_url_path(struct ast_bucket_file *bucket_file, c
static void bucket_file_set_extension(struct ast_bucket_file *bucket_file)
{
/* We will attempt to determine an extension in the following order for backwards
* compatibility:
*
* 1. Look at tail end of URL for extension
* 2. Use the Content-Type header if present
* 3. Parse the URL (assuming we can) and look at the tail of the path
*/
/* Using Content-Type first allows for the most flexibility for whomever
* is serving up the audio file. If that doesn't turn up anything useful
* we'll try to parse the URL and use the extension */
char buffer[64];
if (file_extension_from_url(bucket_file, buffer, sizeof(buffer))
|| file_extension_from_content_type(bucket_file, buffer, sizeof(buffer))
if (file_extension_from_content_type(bucket_file, buffer, sizeof(buffer))
|| file_extension_from_url_path(bucket_file, buffer, sizeof(buffer))) {
ast_bucket_file_metadata_set(bucket_file, "ext", buffer);
}