提交 1ce92b3a authored 作者: Anthony Minessale's avatar Anthony Minessale

FS-6421 --resolve

上级 0fd1e164
...@@ -2385,7 +2385,6 @@ static char *load_cache_data(http_file_context_t *context, const char *url) ...@@ -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;
...@@ -2658,6 +2657,10 @@ static switch_status_t locate_url_file(http_file_context_t *context, const char ...@@ -2658,6 +2657,10 @@ static switch_status_t locate_url_file(http_file_context_t *context, const char
if (context->url_params) { if (context->url_params) {
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;
...@@ -2685,12 +2688,6 @@ static switch_status_t locate_url_file(http_file_context_t *context, const char ...@@ -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);
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论