| -rw-r--r-- | cgit.c | 11 | ||||
| -rw-r--r-- | cgit.h | 2 | ||||
| -rw-r--r-- | cgitrc.5.txt | 17 | ||||
| -rw-r--r-- | ui-plain.c | 20 |
4 files changed, 5 insertions, 45 deletions
@@ -17,14 +17,6 @@ const char *cgit_version = CGIT_VERSION; -void add_mimetype(const char *name, const char *value) -{ - struct string_list_item *item; - - item = string_list_insert(xstrdup(name), &ctx.cfg.mimetypes); - item->util = xstrdup(value); -} - void config_cb(const char *name, const char *value) { if (!strcmp(name, "root-title")) @@ -111,8 +103,6 @@ void config_cb(const char *name, const char *value) ctx.cfg.clone_prefix = xstrdup(value); else if (!strcmp(name, "local-time")) ctx.cfg.local_time = atoi(value); - else if (!prefixcmp(name, "mimetype.")) - add_mimetype(name + 9, value); else if (!strcmp(name, "repo.group")) ctx.cfg.repo_group = xstrdup(value); else if (!strcmp(name, "repo.url")) @@ -225,7 +215,6 @@ static void prepare_context(struct cgit_context *ctx) ctx->page.modified = time(NULL); ctx->page.expires = ctx->page.modified; ctx->page.etag = NULL; - memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); } struct refmatch { @@ -15,7 +15,6 @@ #include <revision.h> #include <log-tree.h> #include <archive.h> -#include <string-list.h> #include <xdiff-interface.h> #include <xdiff/xdiff.h> #include <utf8.h> @@ -176,7 +175,6 @@ struct cgit_config { int summary_branches; int summary_log; int summary_tags; - struct string_list mimetypes; }; struct cgit_page { diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 0412f64..7754923 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -147,10 +147,6 @@ max-stats:: "month", "quarter" and "year". If unspecified, statistics are disabled. Default value: none. See also: "repo.max-stats". -mimetype.<ext>:: - Set the mimetype for the specified filename extension. This is used - by the `plain` command when returning blob content. - module-link:: Text which will be used as the formatstring for a hyperlink when a submodule is printed in a directory listing. The arguments for the @@ -333,19 +329,6 @@ snapshots=tar.gz tar.bz2 zip ## -## List of common mimetypes -## - -mimetype.git=image/git -mimetype.html=text/html -mimetype.jpg=image/jpeg -mimetype.jpeg=image/jpeg -mimetype.pdf=application/pdf -mimetype.png=image/png -mimetype.svg=image/svg+xml - - -## ## List of repositories. ## PS: Any repositories listed when repo.group is unset will not be ## displayed under a group heading @@ -17,9 +17,8 @@ int match; static void print_object(const unsigned char *sha1, const char *path) { enum object_type type; - char *buf, *ext; + char *buf; unsigned long size; - struct string_list_item *mime; type = sha1_object_info(sha1, &size); if (type == OBJ_BAD) { @@ -32,19 +31,10 @@ static void print_object(const unsigned char *sha1, const char *path) html_status(404, "Not found", 0); return; } - ctx.page.mimetype = NULL; - ext = strrchr(path, '.'); - if (ext && *(++ext)) { - mime = string_list_lookup(ext, &ctx.cfg.mimetypes); - if (mime) - ctx.page.mimetype = (char *)mime->util; - } - if (!ctx.page.mimetype) { - if (buffer_is_binary(buf, size)) - ctx.page.mimetype = "application/octet-stream"; - else - ctx.page.mimetype = "text/plain"; - } + if (buffer_is_binary(buf, size)) + ctx.page.mimetype = "application/octet-stream"; + else + ctx.page.mimetype = "text/plain"; ctx.page.filename = fmt("%s", path); ctx.page.size = size; ctx.page.etag = sha1_to_hex(sha1); |