summaryrefslogtreecommitdiff
path: root/main/http.c
diff options
context:
space:
mode:
Diffstat (limited to 'main/http.c')
-rw-r--r--main/http.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/main/http.c b/main/http.c
index c3df5af42..c0212d242 100644
--- a/main/http.c
+++ b/main/http.c
@@ -136,13 +136,16 @@ static AST_RWLIST_HEAD_STATIC(uri_redirects, http_uri_redirect);
static const char *ftype2mtype(const char *ftype, char *wkspace, int wkspacelen)
{
int x;
+
if (ftype) {
- for (x=0;x<sizeof(mimetypes) / sizeof(mimetypes[0]); x++) {
+ for (x = 0; x < ARRAY_LEN(mimetypes); x++) {
if (!strcasecmp(ftype, mimetypes[x].ext))
return mimetypes[x].mtype;
}
}
- snprintf(wkspace, wkspacelen, "text/%s", ftype ? ftype : "plain");
+
+ snprintf(wkspace, wkspacelen, "text/%s", S_OR(ftype, "plain"));
+
return wkspace;
}