Merge pull request #304 from xant/master

allow to define a default mime-type
This commit is contained in:
Sergey Lyubka
2014-01-24 09:51:51 -08:00
2 changed files with 4 additions and 4 deletions
+3 -3
View File
@@ -1993,7 +1993,7 @@ static void write_to_socket(struct connection *conn) {
}
}
const char *mg_get_mime_type(const char *path) {
const char *mg_get_mime_type(const char *path, const char *default_mime_type) {
const char *ext;
size_t i, path_len;
@@ -2007,7 +2007,7 @@ const char *mg_get_mime_type(const char *path) {
}
}
return "text/plain";
return default_mime_type;
}
static struct uri_handler *find_uri_handler(struct mg_server *server,
@@ -2093,7 +2093,7 @@ static void get_mime_type(const struct mg_server *server, const char *path,
}
}
vec->ptr = mg_get_mime_type(path);
vec->ptr = mg_get_mime_type(path, "text/plain");
vec->len = strlen(vec->ptr);
}
+1 -1
View File
@@ -86,7 +86,7 @@ int mg_printf(struct mg_connection *conn, const char *fmt, ...);
const char *mg_get_header(const struct mg_connection *, const char *name);
const char *mg_get_mime_type(const char *file_name);
const char *mg_get_mime_type(const char *file_name, const char *default_mime_type);
int mg_get_var(const struct mg_connection *conn, const char *var_name,
char *buf, size_t buf_len);
int mg_parse_header(const char *hdr, const char *var_name, char *buf, size_t);