kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-19 11:42:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 61407 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r61407 | russell | 2007-04-11 09:48:01 -0500 (Wed, 11 Apr 2007) | 4 lines

Add "svgz" to the mimetypes table.  (issue #9510, bkruse)

In passing, constify the elements of the mimetypes table.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61410 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-04-11 14:49:07 +00:00
parent e34c67d308
commit 2047feb97e
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
main/http.c
View File

@@ -111,8 +111,8 @@ static int enablestatic;
/*! \brief Limit the kinds of files we're willing to serve up */ /*! \brief Limit the kinds of files we're willing to serve up */
static struct { static struct {
char *ext; const char *ext;
char *mtype; const char *mtype;
} mimetypes[] = { } mimetypes[] = {
{ "png", "image/png" }, { "png", "image/png" },
{ "jpg", "image/jpeg" }, { "jpg", "image/jpeg" },
@@ -120,6 +120,7 @@ static struct {
{ "wav", "audio/x-wav" }, { "wav", "audio/x-wav" },
{ "mp3", "audio/mpeg" }, { "mp3", "audio/mpeg" },
{ "svg", "image/svg+xml" }, { "svg", "image/svg+xml" },
{ "svgz", "image/svg+xml" },
{ "gif", "image/gif" }, { "gif", "image/gif" },
}; };
@@ -131,7 +132,7 @@ struct http_uri_redirect {
static AST_RWLIST_HEAD_STATIC(uri_redirects, http_uri_redirect); static AST_RWLIST_HEAD_STATIC(uri_redirects, http_uri_redirect);
static char *ftype2mtype(const char *ftype, char *wkspace, int wkspacelen) static const char *ftype2mtype(const char *ftype, char *wkspace, int wkspacelen)
{ {
int x; int x;
if (ftype) { if (ftype) {
@@ -160,7 +161,8 @@ static struct ast_str *static_callback(struct sockaddr_in *req, const char *uri,
{ {
struct ast_str *result; struct ast_str *result;
char *path; char *path;
char *ftype, *mtype; char *ftype;
const char *mtype;
char wkspace[80]; char wkspace[80];
struct stat st; struct stat st;
int len; int len;
@@ -178,7 +180,7 @@ static struct ast_str *static_callback(struct sockaddr_in *req, const char *uri,
if ((ftype = strrchr(uri, '.'))) if ((ftype = strrchr(uri, '.')))
ftype++; ftype++;
mtype=ftype2mtype(ftype, wkspace, sizeof(wkspace)); mtype = ftype2mtype(ftype, wkspace, sizeof(wkspace));
/* Cap maximum length */ /* Cap maximum length */
len = strlen(uri) + strlen(ast_config_AST_DATA_DIR) + strlen("/static-http/") + 5; len = strlen(uri) + strlen(ast_config_AST_DATA_DIR) + strlen("/static-http/") + 5;