kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-06 10:26:41 +00:00
Code Issues Projects Releases Wiki Activity

FS-6421 --resolve

Browse Source
This commit is contained in:
Anthony Minessale 2014-04-02 16:43:36 -05:00
parent 693eea0d03
commit 51e2d9bf84
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mod/applications/mod_httapi/mod_httapi.c
View File

@ -2385,7 +2385,6 @@ static char *load_cache_data(http_file_context_t *context, const char *url)
} }
context->cache_file = switch_core_sprintf(context->pool, "%s%s%s%s%s", globals.cache_path, SWITCH_PATH_SEPARATOR, digest, ext ? "." : "", ext ? ext : ""); context->cache_file = switch_core_sprintf(context->pool, "%s%s%s%s%s", globals.cache_path, SWITCH_PATH_SEPARATOR, digest, ext ? "." : "", ext ? ext : "");
switch_safe_free(dext); switch_safe_free(dext);
return context->cache_file; return context->cache_file;
@ -2659,6 +2658,10 @@ static switch_status_t locate_url_file(http_file_context_t *context, const char
ext = switch_event_get_header(context->url_params, "ext"); ext = switch_event_get_header(context->url_params, "ext");
} }
if (zstr(ext)) {
ext = find_ext(context->cache_file);
}
if (!context->url_params || !switch_true(switch_event_get_header(context->url_params, "nohead"))) { if (!context->url_params || !switch_true(switch_event_get_header(context->url_params, "nohead"))) {
const char *ct = NULL; const char *ct = NULL;
const char *newext = NULL; const char *newext = NULL;
@ -2685,12 +2688,6 @@ static switch_status_t locate_url_file(http_file_context_t *context, const char
if (newext) { if (newext) {
ext = newext; ext = newext;
} else if (zstr(ext)) {
ext = find_ext(context->cache_file);
}
if (newext) {
context->cache_file = switch_core_sprintf(context->pool, "%s.%s", context->cache_file, newext); context->cache_file = switch_core_sprintf(context->pool, "%s.%s", context->cache_file, newext);
} }