28 files changed, 594 insertions, 183 deletions

diff --git a/.gitignore b/.gitignore
index 1e016e5..487728b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,10 @@
 cgit
 cgit.conf
 VERSION
+cgitrc.5
+cgitrc.5.fo
+cgitrc.5.html
+cgitrc.5.pdf
+cgitrc.5.xml
 *.o
 *.d
diff --git a/Makefile b/Makefile
index 33c606d..1f9893a 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 1.6.1.1
+GIT_VER = 1.6.3.4
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 INSTALL = install
 
@@ -100,7 +100,8 @@ ifdef NEEDS_LIBICONV
 endif
 
 
-.PHONY: all libgit test install uninstall clean force-version get-git
+.PHONY: all libgit test install uninstall clean force-version get-git \
+        doc man-doc html-doc clean-doc
 
 all: cgit
 
@@ -149,8 +150,22 @@ uninstall:
         rm -f $(CGIT_DATA_PATH)/cgit.css
         rm -f $(CGIT_DATA_PATH)/cgit.png
 
-clean:
+doc: man-doc html-doc pdf-doc
+
+man-doc: cgitrc.5.txt
+        a2x -f manpage cgitrc.5.txt
+
+html-doc: cgitrc.5.txt
+        a2x -f xhtml --stylesheet=cgit-doc.css cgitrc.5.txt
+
+pdf-doc: cgitrc.5.txt
+        a2x -f pdf cgitrc.5.txt
+
+clean: clean-doc
         rm -f cgit VERSION *.o *.d
 
+clean-doc:
+        rm -f cgitrc.5 cgitrc.5.html cgitrc.5.pdf cgitrc.5.xml cgitrc.5.fo
+
 get-git:
         curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git
diff --git a/cgit-doc.css b/cgit-doc.css
new file mode 100644
index 0000000..5a399b6
--- /dev/null
+++ b/cgit-doc.css
@@ -0,0 +1,3 @@
+div.variablelist dt {
+        margin-top: 1em;
+}
diff --git a/cgit.c b/cgit.c
index 5301840..b0e1c44 100644
--- a/cgit.c
+++ b/cgit.c
@@ -17,6 +17,29 @@
 
 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);
+}
+
+struct cgit_filter *new_filter(const char *cmd, int extra_args)
+{
+        struct cgit_filter *f;
+
+        if (!cmd || !cmd[0])
+                return NULL;
+
+        f = xmalloc(sizeof(struct cgit_filter));
+        f->cmd = xstrdup(cmd);
+        f->argv = xmalloc((2 + extra_args) * sizeof(char *));
+        f->argv[0] = f->cmd;
+        f->argv[1] = NULL;
+        return f;
+}
+
 void config_cb(const char *name, const char *value)
 {
         if (!strcmp(name, "root-title"))
@@ -31,6 +54,8 @@ void config_cb(const char *name, const char *value)
                 ctx.cfg.favicon = xstrdup(value);
         else if (!strcmp(name, "footer"))
                 ctx.cfg.footer = xstrdup(value);
+        else if (!strcmp(name, "head-include"))
+                ctx.cfg.head_include = xstrdup(value);
         else if (!strcmp(name, "header"))
                 ctx.cfg.header = xstrdup(value);
         else if (!strcmp(name, "logo"))
@@ -49,6 +74,10 @@ void config_cb(const char *name, const char *value)
                         ctx.cfg.virtual_root = "";
         } else if (!strcmp(name, "nocache"))
                 ctx.cfg.nocache = atoi(value);
+        else if (!strcmp(name, "noplainemail"))
+                ctx.cfg.noplainemail = atoi(value);
+        else if (!strcmp(name, "noheader"))
+                ctx.cfg.noheader = atoi(value);
         else if (!strcmp(name, "snapshots"))
                 ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
         else if (!strcmp(name, "enable-index-links"))
@@ -71,6 +100,12 @@ void config_cb(const char *name, const char *value)
                 ctx.cfg.cache_static_ttl = atoi(value);
         else if (!strcmp(name, "cache-dynamic-ttl"))
                 ctx.cfg.cache_dynamic_ttl = atoi(value);
+        else if (!strcmp(name, "about-filter"))
+                ctx.cfg.about_filter = new_filter(value, 0);
+        else if (!strcmp(name, "commit-filter"))
+                ctx.cfg.commit_filter = new_filter(value, 0);
+        else if (!strcmp(name, "embedded"))
+                ctx.cfg.embedded = atoi(value);
         else if (!strcmp(name, "max-message-length"))
                 ctx.cfg.max_msg_len = atoi(value);
         else if (!strcmp(name, "max-repodesc-length"))
@@ -79,6 +114,8 @@ void config_cb(const char *name, const char *value)
                 ctx.cfg.max_repo_count = atoi(value);
         else if (!strcmp(name, "max-commit-count"))
                 ctx.cfg.max_commit_count = atoi(value);
+        else if (!strcmp(name, "source-filter"))
+                ctx.cfg.source_filter = new_filter(value, 1);
         else if (!strcmp(name, "summary-log"))
                 ctx.cfg.summary_log = atoi(value);
         else if (!strcmp(name, "summary-branches"))
@@ -95,6 +132,8 @@ 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"))
@@ -121,6 +160,12 @@ void config_cb(const char *name, const char *value)
                 ctx.repo->max_stats = cgit_find_stats_period(value, NULL);
         else if (ctx.repo && !strcmp(name, "repo.module-link"))
                 ctx.repo->module_link= xstrdup(value);
+        else if (ctx.repo && !strcmp(name, "repo.about-filter"))
+                ctx.repo->about_filter = new_filter(value, 0);
+        else if (ctx.repo && !strcmp(name, "repo.commit-filter"))
+                ctx.repo->commit_filter = new_filter(value, 0);
+        else if (ctx.repo && !strcmp(name, "repo.source-filter"))
+                ctx.repo->source_filter = new_filter(value, 1);
         else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) {
                 if (*value == '/')
                         ctx.repo->readme = xstrdup(value);
@@ -173,6 +218,11 @@ static void querystring_cb(const char *name, const char *value)
         }
 }
 
+char *xstrdupn(const char *str)
+{
+        return (str ? xstrdup(str) : NULL);
+}
+
 static void prepare_context(struct cgit_context *ctx)
 {
         memset(ctx, 0, sizeof(ctx));
@@ -186,7 +236,7 @@ static void prepare_context(struct cgit_context *ctx)
         ctx->cfg.cache_root_ttl = 5;
         ctx->cfg.cache_static_ttl = -1;
         ctx->cfg.css = "/cgit.css";
-        ctx->cfg.logo = "/git-logo.png";
+        ctx->cfg.logo = "/cgit.png";
         ctx->cfg.local_time = 0;
         ctx->cfg.max_repo_count = 50;
         ctx->cfg.max_commit_count = 50;
@@ -203,12 +253,30 @@ static void prepare_context(struct cgit_context *ctx)
         ctx->cfg.summary_branches = 10;
         ctx->cfg.summary_log = 10;
         ctx->cfg.summary_tags = 10;
+        ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG"));
+        ctx->env.http_host = xstrdupn(getenv("HTTP_HOST"));
+        ctx->env.https = xstrdupn(getenv("HTTPS"));
+        ctx->env.no_http = xstrdupn(getenv("NO_HTTP"));
+        ctx->env.path_info = xstrdupn(getenv("PATH_INFO"));
+        ctx->env.query_string = xstrdupn(getenv("QUERY_STRING"));
+        ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD"));
+        ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME"));
+        ctx->env.server_name = xstrdupn(getenv("SERVER_NAME"));
+        ctx->env.server_port = xstrdupn(getenv("SERVER_PORT"));
         ctx->page.mimetype = "text/html";
         ctx->page.charset = PAGE_ENCODING;
         ctx->page.filename = NULL;
         ctx->page.size = 0;
         ctx->page.modified = time(NULL);
         ctx->page.expires = ctx->page.modified;
+        ctx->page.etag = NULL;
+        memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list));
+        if (ctx->env.script_name)
+                ctx->cfg.script_name = ctx->env.script_name;
+        if (ctx->env.query_string)
+                ctx->qry.raw = ctx->env.query_string;
+        if (!ctx->env.cgit_config)
+                ctx->env.cgit_config = CGIT_CONFIG;
 }
 
 struct refmatch {
@@ -288,6 +356,8 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
         if (get_sha1(ctx->qry.head, sha1)) {
                 tmp = xstrdup(ctx->qry.head);
                 ctx->qry.head = ctx->repo->defbranch;
+                ctx->page.status = 404;
+                ctx->page.statusmsg = "not found";
                 cgit_print_http_headers(ctx);
                 cgit_print_docstart(ctx);
                 cgit_print_pageheader(ctx);
@@ -379,6 +449,9 @@ static void cgit_parse_args(int argc, const char **argv)
                 if (!strcmp(argv[i], "--nocache")) {
                         ctx.cfg.nocache = 1;
                 }
+                if (!strcmp(argv[i], "--nohttp")) {
+                        ctx.env.no_http = "1";
+                }
                 if (!strncmp(argv[i], "--query=", 8)) {
                         ctx.qry.raw = xstrdup(argv[i]+8);
                 }
@@ -431,7 +504,6 @@ static int calc_ttl()
 
 int main(int argc, const char **argv)
 {
-        const char *cgit_config_env = getenv("CGIT_CONFIG");
         const char *path;
         char *qry;
         int err, ttl;
@@ -441,13 +513,8 @@ int main(int argc, const char **argv)
         cgit_repolist.count = 0;
         cgit_repolist.repos = NULL;
 
-        if (getenv("SCRIPT_NAME"))
-                ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME"));
-        if (getenv("QUERY_STRING"))
-                ctx.qry.raw = xstrdup(getenv("QUERY_STRING"));
         cgit_parse_args(argc, argv);
-        parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG,
-                         config_cb);
+        parse_configfile(ctx.env.cgit_config, config_cb);
         ctx.repo = NULL;
         http_parse_querystring(ctx.qry.raw, querystring_cb);
 
@@ -462,7 +529,7 @@ int main(int argc, const char **argv)
          * urls without the need for rewriterules in the webserver (as
          * long as PATH_INFO is included in the cache lookup key).
          */
-        path = getenv("PATH_INFO");
+        path = ctx.env.path_info;
         if (!ctx.qry.url && path) {
                 if (path[0] == '/')
                         path++;
@@ -472,12 +539,14 @@ int main(int argc, const char **argv)
                         ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry));
                         free(qry);
                 } else
-                        ctx.qry.raw = ctx.qry.url;
+                        ctx.qry.raw = xstrdup(ctx.qry.url);
                 cgit_parse_url(ctx.qry.url);
         }
 
         ttl = calc_ttl();
         ctx.page.expires += ttl*60;
+        if (ctx.env.request_method && !strcmp(ctx.env.request_method, "HEAD"))
+                ctx.cfg.nocache = 1;
         if (ctx.cfg.nocache)
                 ctx.cfg.cache_size = 0;
         err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root,
diff --git a/cgit.css b/cgit.css
index adfc8ae..e3b32e7 100644
--- a/cgit.css
+++ b/cgit.css
@@ -155,7 +155,7 @@ table.list td.logsubject {
 table.list td.logmsg {
         font-family: monospace;
         white-space: pre;
-        padding: 1em 0em 2em 0em;
+        padding: 1em 0.5em 2em 0.5em;
 }
 
 table.list td a {
diff --git a/cgit.h b/cgit.h
index 5f7af51..adb8da4 100644
--- a/cgit.h
+++ b/cgit.h
@@ -15,6 +15,7 @@
 #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>
@@ -48,6 +49,15 @@ typedef void (*configfn)(const char *name, const char *value);
 typedef void (*filepair_fn)(struct diff_filepair *pair);
 typedef void (*linediff_fn)(char *line, int len);
 
+struct cgit_filter {
+        char *cmd;
+        char **argv;
+        int old_stdout;
+        int pipe_fh[2];
+        int pid;
+        int exitstatus;
+};
+
 struct cgit_repo {
         char *url;
         char *name;
@@ -64,6 +74,9 @@ struct cgit_repo {
         int enable_log_linecount;
         int max_stats;
         time_t mtime;
+        struct cgit_filter *about_filter;
+        struct cgit_filter *commit_filter;
+        struct cgit_filter *source_filter;
 };
 
 struct cgit_repolist {
@@ -136,6 +149,7 @@ struct cgit_config {
         char *css;
         char *favicon;
         char *footer;
+        char *head_include;
         char *header;
         char *index_header;
         char *index_info;
@@ -155,6 +169,7 @@ struct cgit_config {
         int cache_repo_ttl;
         int cache_root_ttl;
         int cache_static_ttl;
+        int embedded;
         int enable_index_links;
         int enable_log_filecount;
         int enable_log_linecount;
@@ -166,11 +181,17 @@ struct cgit_config {
         int max_repodesc_len;
         int max_stats;
         int nocache;
+        int noplainemail;
+        int noheader;
         int renamelimit;
         int snapshots;
         int summary_branches;
         int summary_log;
         int summary_tags;
+        struct string_list mimetypes;
+        struct cgit_filter *about_filter;
+        struct cgit_filter *commit_filter;
+        struct cgit_filter *source_filter;
 };
 
 struct cgit_page {
@@ -180,10 +201,27 @@ struct cgit_page {
         char *mimetype;
         char *charset;
         char *filename;
+        char *etag;
         char *title;
+        int status;
+        char *statusmsg;
+};
+
+struct cgit_environment {
+        char *cgit_config;
+        char *http_host;
+        char *https;
+        char *no_http;
+        char *path_info;
+        char *query_string;
+        char *request_method;
+        char *script_name;
+        char *server_name;
+        char *server_port;
 };
 
 struct cgit_context {
+        struct cgit_environment env;
         struct cgit_query qry;
         struct cgit_config cfg;
         struct cgit_repo *repo;
@@ -242,5 +280,9 @@ extern const char *cgit_repobasename(const char *reponame);
 
 extern int cgit_parse_snapshots_mask(const char *str);
 
+extern int cgit_open_filter(struct cgit_filter *filter);
+extern int cgit_close_filter(struct cgit_filter *filter);
+
+extern int readfile(const char *path, char **buf, size_t *size);
 
 #endif /* CGIT_H */
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index fd299ae..0d18290 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -1,203 +1,247 @@
-CGITRC
-======
+CGITRC(5)
+========
 
 
 NAME
 ----
-        cgitrc - runtime configuration for cgit
+cgitrc - runtime configuration for cgit
 
 
-DESCRIPTION
------------
+SYNOPSIS
+--------
 Cgitrc contains all runtime settings for cgit, including the list of git
 repositories, formatted as a line-separated list of NAME=VALUE pairs. Blank
 lines, and lines starting with '#', are ignored.
 
 
+LOCATION
+--------
+The default location of cgitrc, defined at compile time, is /etc/cgitrc. At
+runtime, cgit will consult the environment variable CGIT_CONFIG and, if
+defined, use its value instead.
+
+
 GLOBAL SETTINGS
 ---------------
-agefile
+about-filter::
+        Specifies a command which will be invoked to format the content of
+        about pages (both top-level and for each repository). The command will
+        get the content of the about-file on its STDIN, and the STDOUT from the
+        command will be included verbatim on the about page. Default value:
+        none.
+
+agefile::
         Specifies a path, relative to each repository path, which can be used
         to specify the date and time of the youngest commit in the repository.
         The first line in the file is used as input to the "parse_date"
         function in libgit. Recommended timestamp-format is "yyyy-mm-dd
         hh:mm:ss". Default value: "info/web/last-modified".
 
-cache-root
+cache-root::
         Path used to store the cgit cache entries. Default value:
         "/var/cache/cgit".
 
-cache-dynamic-ttl
+cache-dynamic-ttl::
         Number which specifies the time-to-live, in minutes, for the cached
         version of repository pages accessed without a fixed SHA1. Default
         value: "5".
 
-cache-repo-ttl
+cache-repo-ttl::
         Number which specifies the time-to-live, in minutes, for the cached
         version of the repository summary page. Default value: "5".
 
-cache-root-ttl
+cache-root-ttl::
         Number which specifies the time-to-live, in minutes, for the cached
         version of the repository index page. Default value: "5".
 
-cache-size
+cache-size::
         The maximum number of entries in the cgit cache. Default value: "0"
         (i.e. caching is disabled).
 
-cache-static-ttl
+cache-static-ttl::
         Number which specifies the time-to-live, in minutes, for the cached
         version of repository pages accessed with a fixed SHA1. Default value:
         "5".
 
-clone-prefix
+clone-prefix::
         Space-separated list of common prefixes which, when combined with a
         repository url, generates valid clone urls for the repository. This
         setting is only used if `repo.clone-url` is unspecified. Default value:
         none.
 
-css
+commit-filter::
+        Specifies a command which will be invoked to format commit messages.
+        The command will get the message on its STDIN, and the STDOUT from the
+        command will be included verbatim as the commit message, i.e. this can
+        be used to implement bugtracker integration. Default value: none.
+
+css::
         Url which specifies the css document to include in all cgit pages.
         Default value: "/cgit.css".
 
-enable-index-links
+embedded::
+        Flag which, when set to "1", will make cgit generate a html fragment
+        suitable for embedding in other html pages. Default value: none. See
+        also: "noheader".
+        
+enable-index-links::
         Flag which, when set to "1", will make cgit generate extra links for
         each repo in the repository index (specifically, to the "summary",
         "commit" and "tree" pages). Default value: "0".
 
-enable-log-filecount
+enable-log-filecount::
         Flag which, when set to "1", will make cgit print the number of
         modified files for each commit on the repository log page. Default
         value: "0".
 
-enable-log-linecount
+enable-log-linecount::
         Flag which, when set to "1", will make cgit print the number of added
         and removed lines for each commit on the repository log page. Default
         value: "0".
 
-favicon
+favicon::
         Url used as link to a shortcut icon for cgit. If specified, it is
         suggested to use the value "/favicon.ico" since certain browsers will
         ignore other values. Default value: none.
 
-footer
+footer::
         The content of the file specified with this option will be included
         verbatim at the bottom of all pages (i.e. it replaces the standard
         "generated by..." message. Default value: none.
 
-header
+head-include::
+        The content of the file specified with this option will be included
+        verbatim in the html HEAD section on all pages. Default value: none.
+
+header::
         The content of the file specified with this option will be included
         verbatim at the top of all pages. Default value: none.
 
-include
+include::
         Name of a configfile to include before the rest of the current config-
         file is parsed. Default value: none.
 
-index-header
+index-header::
         The content of the file specified with this option will be included
         verbatim above the repository index. This setting is deprecated, and
         will not be supported by cgit-1.0 (use root-readme instead). Default
         value: none.
 
-index-info
+index-info::
         The content of the file specified with this option will be included
         verbatim below the heading on the repository index page. This setting
         is deprecated, and will not be supported by cgit-1.0 (use root-desc
         instead). Default value: none.
 
-local-time
+local-time::
         Flag which, if set to "1", makes cgit print commit and tag times in the
         servers timezone. Default value: "0".
 
-logo
+logo::
         Url which specifies the source of an image which will be used as a logo
-        on all cgit pages.
+        on all cgit pages. Default value: "/cgit.png".
 
-logo-link
+logo-link::
         Url loaded when clicking on the cgit logo image. If unspecified the
         calculated url of the repository index page will be used. Default
         value: none.
 
-max-commit-count
+max-commit-count::
         Specifies the number of entries to list per page in "log" view. Default
         value: "50".
 
-max-message-length
+max-message-length::
         Specifies the maximum number of commit message characters to display in
         "log" view. Default value: "80".
 
-max-repo-count
+max-repo-count::
         Specifies the number of entries to list per page on the repository
         index page. Default value: "50".
 
-max-repodesc-length
+max-repodesc-length::
         Specifies the maximum number of repo description characters to display
         on the repository index page. Default value: "80".
 
-max-stats
+max-stats::
         Set the default maximum statistics period. Valid values are "week",
         "month", "quarter" and "year". If unspecified, statistics are
         disabled. Default value: none. See also: "repo.max-stats".
 
-module-link
+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
         formatstring are the path and SHA1 of the submodule commit. Default
         value: "./?repo=%s&page=commit&id=%s"
 
-nocache
+nocache::
         If set to the value "1" caching will be disabled. This settings is
         deprecated, and will not be honored starting with cgit-1.0. Default
         value: "0".
 
-renamelimit
+noplainemail::
+        If set to "1" showing full author email adresses will be disabled.
+        Default value: "0".
+
+noheader::
+        Flag which, when set to "1", will make cgit omit the standard header
+        on all pages. Default value: none. See also: "embedded".
+
+renamelimit::
         Maximum number of files to consider when detecting renames. The value
          "-1" uses the compiletime value in git (for further info, look at
           `man git-diff`). Default value: "-1".
 
-repo.group
+repo.group::
         A value for the current repository group, which all repositories
         specified after this setting will inherit. Default value: none.
 
-robots
+robots::
         Text used as content for the "robots" meta-tag. Default value:
         "index, nofollow".
 
-root-desc
+root-desc::
         Text printed below the heading on the repository index page. Default
         value: "a fast webinterface for the git dscm".
 
-root-readme:
+root-readme::
         The content of the file specified with this option will be included
         verbatim below the "about" link on the repository index page. Default
         value: none.
 
-root-title
+root-title::
         Text printed as heading on the repository index page. Default value:
         "Git Repository Browser".
 
-snapshots
-        Text which specifies the default (and allowed) set of snapshot formats
-        supported by cgit. The value is a space-separated list of zero or more
-        of the following values:
-                "tar"           uncompressed tar-file
-                "tar.gz"        gzip-compressed tar-file
-                "tar.bz2"       bzip-compressed tar-file
-                "zip"           zip-file
-        Default value: none.
+snapshots::
+        Text which specifies the default set of snapshot formats generated by
+        cgit. The value is a space-separated list of zero or more of the
+        values "tar", "tar.gz", "tar.bz2" and "zip". Default value: none.
+
+source-filter::
+        Specifies a command which will be invoked to format plaintext blobs
+        in the tree view. The command will get the blob content on its STDIN
+        and the name of the blob as its only command line argument. The STDOUT
+        from the command will be included verbatim as the blob contents, i.e.
+        this can be used to implement e.g. syntax highlighting. Default value:
+        none.
 
-summary-branches
+summary-branches::
         Specifies the number of branches to display in the repository "summary"
         view. Default value: "10".
 
-summary-log
+summary-log::
         Specifies the number of log entries to display in the repository
         "summary" view. Default value: "10".
 
-summary-tags
+summary-tags::
         Specifies the number of tags to display in the repository "summary"
         view. Default value: "10".
 
-virtual-root
+virtual-root::
         Url which, if specified, will be used as root for all cgit links. It
         will also cause cgit to generate 'virtual urls', i.e. urls like
         '/cgit/tree/README' as opposed to '?r=cgit&p=tree&path=README'. Default
@@ -207,51 +251,60 @@ virtual-root
 
 REPOSITORY SETTINGS
 -------------------
-repo.clone-url
+repo.about-filter::
+        Override the default about-filter. Default value: <about-filter>.
+
+repo.clone-url::
         A list of space-separated urls which can be used to clone this repo.
         Default value: none.
 
-repo.defbranch
+repo.commit-filter::
+        Override the default commit-filter. Default value: <commit-filter>.
+
+repo.defbranch::
         The name of the default branch for this repository. If no such branch
         exists in the repository, the first branch name (when sorted) is used
         as default instead. Default value: "master".
 
-repo.desc
+repo.desc::
         The value to show as repository description. Default value: none.
 
-repo.enable-log-filecount
+repo.enable-log-filecount::
         A flag which can be used to disable the global setting
         `enable-log-filecount'. Default value: none.
 
-repo.enable-log-linecount
+repo.enable-log-linecount::
         A flag which can be used to disable the global setting
         `enable-log-linecount'. Default value: none.
 
-repo.max-stats
+repo.max-stats::
         Override the default maximum statistics period. Valid values are equal
         to the values specified for the global "max-stats" setting. Default
         value: none.
 
-repo.name
+repo.name::
         The value to show as repository name. Default value: <repo.url>.
 
-repo.owner
+repo.owner::
         A value used to identify the owner of the repository. Default value:
         none.
 
-repo.path
+repo.path::
         An absolute path to the repository directory. For non-bare repositories
         this is the .git-directory. Default value: none.
 
-repo.readme
+repo.readme::
         A path (relative to <repo.path>) which specifies a file to include
         verbatim as the "About" page for this repo. Default value: none.
 
-repo.snapshots
+repo.snapshots::
         A mask of allowed snapshot-formats for this repo, restricted by the
         "snapshots" global setting. Default value: <snapshots>.
 
-repo.url
+repo.source-filter::
+        Override the default source-filter. Default value: <source-filter>.
+
+repo.url::
         The relative url used to access the repository. This must be the first
         setting specified for each repo. Default value: none.
 
@@ -259,6 +312,7 @@ repo.url
 EXAMPLE CGITRC FILE
 -------------------
 
+....
 # Enable caching of up to 1000 output entriess
 cache-size=1000
 
@@ -311,6 +365,19 @@ 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
@@ -368,6 +435,7 @@ repo.enable-log-linecount=0
 
 # Restrict the max statistics period for this repo
 repo.max-stats=month
+....
 
 
 BUGS
diff --git a/cmd.c b/cmd.c
index cf97da7..766f903 100644
--- a/cmd.c
+++ b/cmd.c
@@ -39,7 +39,7 @@ static void atom_fn(struct cgit_context *ctx)
 static void about_fn(struct cgit_context *ctx)
 {
         if (ctx->repo)
-                cgit_print_repo_readme();
+                cgit_print_repo_readme(ctx->qry.path);
         else
                 cgit_print_site_readme();
 }
diff --git a/filters/commit-links.sh b/filters/commit-links.sh
new file mode 100755
index 0000000..165a533
--- /dev/null
+++ b/filters/commit-links.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+# This script can be used to generate links in commit messages - the first
+# sed expression generates links to commits referenced by their SHA1, while
+# the second expression generates links to a fictional bugtracker.
+#
+# To use this script, refer to this file with either the commit-filter or the
+# repo.commit-filter options in cgitrc.
+
+sed -re '
+s|\b([0-9a-fA-F]{8,40})\b|<a href="./?id=\1">\1</a>|g
+s| #([0-9]+)\b|<a href="http://bugs.example.com/?bug=\1">#\1</a>|g
+'
diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh
new file mode 100755
index 0000000..999ad0c
--- /dev/null
+++ b/filters/syntax-highlighting.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+# This script can be used to implement syntax highlighting in the cgit
+# tree-view by refering to this file with the source-filter or repo.source-
+# filter options in cgitrc.
+#
+# Note: the highlight command (http://www.andre-simon.de/) uses css for syntax
+# highlighting, so you'll probably want something like the following included
+# in your css file (generated by highlight 2.4.8 and adapted for cgit):
+#
+# table.blob .num  { color:#2928ff; }
+# table.blob .esc  { color:#ff00ff; }
+# table.blob .str  { color:#ff0000; }
+# table.blob .dstr { color:#818100; }
+# table.blob .slc  { color:#838183; font-style:italic; }
+# table.blob .com  { color:#838183; font-style:italic; }
+# table.blob .dir  { color:#008200; }
+# table.blob .sym  { color:#000000; }
+# table.blob .kwa  { color:#000000; font-weight:bold; }
+# table.blob .kwb  { color:#830000; }
+# table.blob .kwc  { color:#000000; font-weight:bold; }
+# table.blob .kwd  { color:#010181; }
+
+case "$1" in
+        *.c)
+                highlight -f -I -X -S c
+                ;;
+        *.h)
+                highlight -f -I -X -S c
+                ;;
+        *.sh)
+                highlight -f -I -X -S sh
+                ;;
+        *.css)
+                highlight -f -I -X -S css
+                ;;
+        *)
+                highlight -f -I -X -S txt
+                ;;
+esac
diff --git a/git b/git
-Subproject 5c415311f743ccb11a50f350ff1c385778f049d
+Subproject e276f018f2c1f0fc962fbe44a36708d1cdebada
diff --git a/scan-tree.c b/scan-tree.c
index 47f3988..4da21a4 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -35,25 +35,13 @@ static int is_git_dir(const char *path)
         return 1;
 }
 
-char *readfile(const char *path)
-{
-        FILE *f;
-        static char buf[MAX_PATH];
-
-        if (!(f = fopen(path, "r")))
-                return NULL;
-        buf[0] = 0;
-        fgets(buf, MAX_PATH, f);
-        fclose(f);
-        return buf;
-}
-
 static void add_repo(const char *base, const char *path)
 {
         struct cgit_repo *repo;
         struct stat st;
         struct passwd *pwd;
         char *p;
+        size_t size;
 
         if (stat(path, &st)) {
                 fprintf(stderr, "Error accessing %s: %s (%d)\n",
@@ -76,11 +64,14 @@ static void add_repo(const char *base, const char *path)
         repo = cgit_add_repo(xstrdup(p));
         repo->name = repo->url;
         repo->path = xstrdup(path);
+        p = (pwd && pwd->pw_gecos) ? strchr(pwd->pw_gecos, ',') : NULL;
+        if (p)
+                *p = '\0';
         repo->owner = (pwd ? xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name) : "");
 
         p = fmt("%s/description", path);
         if (!stat(p, &st))
-                repo->desc = xstrdup(readfile(p));
+                readfile(p, &repo->desc, &size);
 
         p = fmt("%s/README.html", path);
         if (!stat(p, &st))
diff --git a/shared.c b/shared.c
index cce0af4..4cb9573 100644
--- a/shared.c
+++ b/shared.c
@@ -62,6 +62,9 @@ struct cgit_repo *cgit_add_repo(const char *url)
         ret->module_link = ctx.cfg.module_link;
         ret->readme = NULL;
         ret->mtime = -1;
+        ret->about_filter = ctx.cfg.about_filter;
+        ret->commit_filter = ctx.cfg.commit_filter;
+        ret->source_filter = ctx.cfg.source_filter;
         return ret;
 }
 
@@ -355,3 +358,59 @@ int cgit_parse_snapshots_mask(const char *str)
         }
         return rv;
 }
+
+int cgit_open_filter(struct cgit_filter *filter)
+{
+
+        filter->old_stdout = chk_positive(dup(STDOUT_FILENO),
+                "Unable to duplicate STDOUT");
+        chk_zero(pipe(filter->pipe_fh), "Unable to create pipe to subprocess");
+        filter->pid = chk_non_negative(fork(), "Unable to create subprocess");
+        if (filter->pid == 0) {
+                close(filter->pipe_fh[1]);
+                chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO),
+                        "Unable to use pipe as STDIN");
+                execvp(filter->cmd, filter->argv);
+                die("Unable to exec subprocess %s: %s (%d)", filter->cmd,
+                        strerror(errno), errno);
+        }
+        close(filter->pipe_fh[0]);
+        chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO),
+                "Unable to use pipe as STDOUT");
+        close(filter->pipe_fh[1]);
+        return 0;
+}
+
+int cgit_close_filter(struct cgit_filter *filter)
+{
+        chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO),
+                "Unable to restore STDOUT");
+        close(filter->old_stdout);
+        if (filter->pid < 0)
+                return 0;
+        waitpid(filter->pid, &filter->exitstatus, 0);
+        if (WIFEXITED(filter->exitstatus) && !WEXITSTATUS(filter->exitstatus))
+                return 0;
+        die("Subprocess %s exited abnormally", filter->cmd);
+}
+
+/* Read the content of the specified file into a newly allocated buffer,
+ * zeroterminate the buffer and return 0 on success, errno otherwise.
+ */
+int readfile(const char *path, char **buf, size_t *size)
+{
+        int fd;
+        struct stat st;
+
+        fd = open(path, O_RDONLY);
+        if (fd == -1)
+                return errno;
+        if (fstat(fd, &st))
+                return errno;
+        if (!S_ISREG(st.st_mode))
+                return EISDIR;
+        *buf = xmalloc(st.st_size + 1);
+        *size = read_in_full(fd, *buf, st.st_size);
+        (*buf)[*size] = '\0';
+        return (*size == st.st_size ? 0 : errno);
+}
diff --git a/ui-atom.c b/ui-atom.c
index a6ea3ee..808b2d0 100644
--- a/ui-atom.c
+++ b/ui-atom.c
@@ -32,7 +32,7 @@ void add_entry(struct commit *commit, char *host)
                 html_txt(info->author);
                 html("</name>\n");
         }
-        if (info->author_email) {
+        if (info->author_email && !ctx.cfg.noplainemail) {
                 mail = xstrdup(info->author_email);
                 t = strchr(mail, '<');
                 if (t)
@@ -52,7 +52,8 @@ void add_entry(struct commit *commit, char *host)
         cgit_print_date(info->author_date, FMT_ATOMDATE, ctx.cfg.local_time);
         html("</published>\n");
         if (host) {
-                html("<link rel='alternate' type='text/html' href='http://");
+                html("<link rel='alternate' type='text/html' href='");
+                html(cgit_httpscheme());
                 html_attr(host);
                 html_attr(cgit_pageurl(ctx.repo->url, "commit", NULL));
                 if (ctx.cfg.virtual_root)
@@ -113,7 +114,8 @@ void cgit_print_atom(char *tip, char *path, int max_count)
         html_txt(ctx.repo->desc);
         html("</subtitle>\n");
         if (host) {
-                html("<link rel='alternate' type='text/html' href='http://");
+                html("<link rel='alternate' type='text/html' href='");
+                html(cgit_httpscheme());
                 html_attr(host);
                 html_attr(cgit_repourl(ctx.repo->url));
                 html("'/>\n");
diff --git a/ui-blob.c b/ui-blob.c
index 3cda03d..2ccd31d 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -27,7 +27,7 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
 
         unsigned char sha1[20];
         enum object_type type;
-        unsigned char *buf;
+        char *buf;
         unsigned long size;
         struct commit *commit;
         const char *paths[] = {path, NULL};
@@ -67,6 +67,12 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
 
         buf[size] = '\0';
         ctx.page.mimetype = ctx.qry.mimetype;
+        if (!ctx.page.mimetype) {
+                if (buffer_is_binary(buf, size))
+                        ctx.page.mimetype = "application/octet-stream";
+                else
+                        ctx.page.mimetype = "text/plain";
+        }
         ctx.page.filename = path;
         cgit_print_http_headers(&ctx);
         write(htmlfd, buf, size);
diff --git a/ui-commit.c b/ui-commit.c
index 41ce70e..d6b73ee 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -40,15 +40,19 @@ void cgit_print_commit(char *hex)
         html("<table summary='commit info' class='commit-info'>\n");
         html("<tr><th>author</th><td>");
         html_txt(info->author);
-        html(" ");
-        html_txt(info->author_email);
+        if (!ctx.cfg.noplainemail) {
+                html(" ");
+                html_txt(info->author_email);
+        }
         html("</td><td class='right'>");
         cgit_print_date(info->author_date, FMT_LONGDATE, ctx.cfg.local_time);
         html("</td></tr>\n");
         html("<tr><th>committer</th><td>");
         html_txt(info->committer);
-        html(" ");
-        html_txt(info->committer_email);
+        if (!ctx.cfg.noplainemail) {
+                html(" ");
+                html_txt(info->committer_email);
+        }
         html("</td><td class='right'>");
         cgit_print_date(info->committer_date, FMT_LONGDATE, ctx.cfg.local_time);
         html("</td></tr>\n");
@@ -89,11 +93,19 @@ void cgit_print_commit(char *hex)
         }
         html("</table>\n");
         html("<div class='commit-subject'>");
+        if (ctx.repo->commit_filter)
+                cgit_open_filter(ctx.repo->commit_filter);
         html_txt(info->subject);
+        if (ctx.repo->commit_filter)
+                cgit_close_filter(ctx.repo->commit_filter);
         show_commit_decorations(commit);
         html("</div>");
         html("<div class='commit-msg'>");
+        if (ctx.repo->commit_filter)
+                cgit_open_filter(ctx.repo->commit_filter);
         html_txt(info->msg);
+        if (ctx.repo->commit_filter)
+                cgit_close_filter(ctx.repo->commit_filter);
         html("</div>");
         if (parents < 3) {
                 if (parents)
diff --git a/ui-log.c b/ui-log.c
index ba2ab03..0b37785 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -53,6 +53,10 @@ void show_commit_decorations(struct commit *commit)
                         strncpy(buf, deco->name + 15, sizeof(buf) - 1);
                         cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
                 }
+                else if (!prefixcmp(deco->name, "refs/tags/")) {
+                        strncpy(buf, deco->name + 10, sizeof(buf) - 1);
+                        cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
+                }
                 else if (!prefixcmp(deco->name, "refs/remotes/")) {
                         strncpy(buf, deco->name + 13, sizeof(buf) - 1);
                         cgit_log_link(buf, NULL, "remote-deco", NULL,
diff --git a/ui-patch.c b/ui-patch.c
index 5d665d3..2a8f7a5 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -108,7 +108,11 @@ void cgit_print_patch(char *hex)
         ctx.page.filename = patchname;
         cgit_print_http_headers(&ctx);
         htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1));
-        htmlf("From: %s %s\n", info->author, info->author_email);
+        htmlf("From: %s", info->author);
+        if (!ctx.cfg.noplainemail) {
+                htmlf(" %s", info->author_email);
+        }
+        html("\n");
         html("Date: ");
         cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n", ctx.cfg.local_time);
         htmlf("Subject: %s\n\n", info->subject);
diff --git a/ui-plain.c b/ui-plain.c
index e08b15b..a4ce077 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -17,8 +17,9 @@ int match;
 static void print_object(const unsigned char *sha1, const char *path)
 {
         enum object_type type;
-        char *buf;
+        char *buf, *ext;
         unsigned long size;
+        struct string_list_item *mime;
 
         type = sha1_object_info(sha1, &size);
         if (type == OBJ_BAD) {
@@ -31,9 +32,22 @@ static void print_object(const unsigned char *sha1, const char *path)
                 html_status(404, "Not found", 0);
                 return;
         }
-        ctx.page.mimetype = "text/plain";
+        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";
+        }
         ctx.page.filename = fmt("%s", path);
         ctx.page.size = size;
+        ctx.page.etag = sha1_to_hex(sha1);
         cgit_print_http_headers(&ctx);
         html_raw(buf, size);
         match = 1;
diff --git a/ui-refs.c b/ui-refs.c
index 25da00a..d3b4f6e 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -46,8 +46,19 @@ static int cmp_tag_age(const void *a, const void *b)
 {
         struct refinfo *r1 = *(struct refinfo **)a;
         struct refinfo *r2 = *(struct refinfo **)b;
+        int r1date, r2date;
 
-        return cmp_age(r1->tag->tagger_date, r2->tag->tagger_date);
+        if (r1->object->type != OBJ_COMMIT)
+                r1date = r1->tag->tagger_date;
+        else
+                r1date = r1->commit->committer_date;
+
+        if (r2->object->type != OBJ_COMMIT)
+                r2date = r2->tag->tagger_date;
+        else
+                r2date = r2->commit->committer_date;
+
+        return cmp_age(r1date, r2date);
 }
 
 static int print_branch(struct refinfo *ref)
@@ -145,6 +156,12 @@ static int print_tag(struct refinfo *ref)
                         print_tag_downloads(ctx.repo, name);
                 else
                         cgit_object_link(ref->object);
+                html("</td><td>");
+                if (ref->object->type == OBJ_COMMIT)
+                        html(ref->commit->author);
+                html("</td><td colspan='2'>");
+                if (ref->object->type == OBJ_COMMIT)
+                        cgit_print_age(ref->commit->commit->date, -1, NULL);
                 html("</td></tr>\n");
         }
         return 0;
diff --git a/ui-repolist.c b/ui-repolist.c
index 3aedde5..7c7aa9b 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -18,19 +18,20 @@
 
 time_t read_agefile(char *path)
 {
-        FILE *f;
-        static char buf[64], buf2[64];
+        time_t result;
+        size_t size;
+        char *buf;
+        static char buf2[64];
 
-        if (!(f = fopen(path, "r")))
+        if (readfile(path, &buf, &size))
                 return -1;
-        buf[0] = 0;
-        if (fgets(buf, sizeof(buf), f) == NULL)
-                return -1;
-        fclose(f);
+
         if (parse_date(buf, buf2, sizeof(buf2)))
-                return strtoul(buf2, NULL, 10);
+                result = strtoul(buf2, NULL, 10);
         else
-                return 0;
+                result = 0;
+        free(buf);
+        return result;
 }
 
 static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
@@ -274,6 +275,11 @@ void cgit_print_repolist()
 
 void cgit_print_site_readme()
 {
-        if (ctx.cfg.root_readme)
-                html_include(ctx.cfg.root_readme);
+        if (!ctx.cfg.root_readme)
+                return;
+        if (ctx.cfg.about_filter)
+                cgit_open_filter(ctx.cfg.about_filter);
+        html_include(ctx.cfg.root_readme);
+        if (ctx.cfg.about_filter)
+                cgit_close_filter(ctx.cfg.about_filter);
 }
diff --git a/ui-shared.c b/ui-shared.c
index 40060ba..07d5dd4 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -34,24 +34,23 @@ void cgit_print_error(char *msg)
         html("</div>\n");
 }
 
-char *cgit_hosturl()
+char *cgit_httpscheme()
 {
-        char *host, *port;
+        if (ctx.env.https && !strcmp(ctx.env.https, "on"))
+                return "https://";
+        else
+                return "http://";
+}
 
-        host = getenv("HTTP_HOST");
-        if (host) {
-                host = xstrdup(host);
-        } else {
-                host = getenv("SERVER_NAME");
-                if (!host)
-                        return NULL;
-                port = getenv("SERVER_PORT");
-                if (port && atoi(port) != 80)
-                        host = xstrdup(fmt("%s:%d", host, atoi(port)));
-                else
-                        host = xstrdup(host);
-        }
-        return host;
+char *cgit_hosturl()
+{
+        if (ctx.env.http_host)
+                return ctx.env.http_host;
+        if (!ctx.env.server_name)
+                return NULL;
+        if (!ctx.env.server_port || atoi(ctx.env.server_port) == 80)
+                return ctx.env.server_name;
+        return xstrdup(fmt("%s:%s", ctx.env.server_name, ctx.env.server_port));
 }
 
 char *cgit_rooturl()
@@ -456,6 +455,11 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
 
 void cgit_print_http_headers(struct cgit_context *ctx)
 {
+        if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1"))
+                return;
+
+        if (ctx->page.status)
+                htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg);
         if (ctx->page.mimetype && ctx->page.charset)
                 htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
                       ctx->page.charset);
@@ -468,11 +472,21 @@ void cgit_print_http_headers(struct cgit_context *ctx)
                       ctx->page.filename);
         htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
         htmlf("Expires: %s\n", http_date(ctx->page.expires));
+        if (ctx->page.etag)
+                htmlf("ETag: \"%s\"\n", ctx->page.etag);
         html("\n");
+        if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD"))
+                exit(0);
 }
 
 void cgit_print_docstart(struct cgit_context *ctx)
 {
+        if (ctx->cfg.embedded) {
+                if (ctx->cfg.header)
+                        html_include(ctx->cfg.header);
+                return;
+        }
+
         char *host = cgit_hosturl();
         html(cgit_doctype);
         html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
@@ -492,12 +506,15 @@ void cgit_print_docstart(struct cgit_context *ctx)
                 html("'/>\n");
         }
         if (host && ctx->repo) {
-                html("<link rel='alternate' title='Atom feed' href='http://");
+                html("<link rel='alternate' title='Atom feed' href='");
+                html(cgit_httpscheme());
                 html_attr(cgit_hosturl());
                 html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
                                        fmt("h=%s", ctx->qry.head)));
-                html("' type='application/atom+xml'/>");
+                html("' type='application/atom+xml'/>\n");
         }
+        if (ctx->cfg.head_include)
+                html_include(ctx->cfg.head_include);
         html("</head>\n");
         html("<body>\n");
         if (ctx->cfg.header)
@@ -506,7 +523,13 @@ void cgit_print_docstart(struct cgit_context *ctx)
 
 void cgit_print_docend()
 {
-        html("</div>");
+        html("</div> <!-- class=content -->\n");
+        if (ctx.cfg.embedded) {
+                html("</div> <!-- id=cgit -->\n");
+                if (ctx.cfg.footer)
+                        html_include(ctx.cfg.footer);
+                return;
+        }
         if (ctx.cfg.footer)
                 html_include(ctx.cfg.footer);
         else {
@@ -515,6 +538,7 @@ void cgit_print_docend()
                 cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
                 html("</div>\n");
         }
+        html("</div> <!-- id=cgit -->\n");
         html("</body>\n</html>\n");
 }
 
@@ -602,13 +626,8 @@ char *hc(struct cgit_cmd *cmd, const char *page)
         return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active");
 }
 
-void cgit_print_pageheader(struct cgit_context *ctx)
+static void print_header(struct cgit_context *ctx)
 {
-        struct cgit_cmd *cmd = cgit_get_cmd(ctx);
-
-        if (!cmd && ctx->repo)
-                fallback_cmd = "summary";
-
         html("<table id='header'>\n");
         html("<tr>\n");
 
@@ -652,6 +671,18 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                         html_include(ctx->cfg.index_info);
         }
         html("</td></tr></table>\n");
+}
+
+void cgit_print_pageheader(struct cgit_context *ctx)
+{
+        struct cgit_cmd *cmd = cgit_get_cmd(ctx);
+
+        if (!cmd && ctx->repo)
+                fallback_cmd = "summary";
+
+        html("<div id='cgit'>");
+        if (!ctx->cfg.noheader)
+                print_header(ctx);
 
         html("<table class='tabs'><tr><td>\n");
         if (ctx->repo) {
diff --git a/ui-shared.h b/ui-shared.h
index 5a3821f..bff4826 100644
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -1,6 +1,7 @@
 #ifndef UI_SHARED_H
 #define UI_SHARED_H
 
+extern char *cgit_httpscheme();
 extern char *cgit_hosturl();
 extern char *cgit_repourl(const char *reponame);
 extern char *cgit_fileurl(const char *reponame, const char *pagename,
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 5372f5d..4136b3e 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -12,37 +12,16 @@
 
 static int write_compressed_tar_archive(struct archiver_args *args,const char *filter)
 {
-        int rw[2];
-        pid_t gzpid;
-        int stdout2;
-        int status;
         int rv;
+        struct cgit_filter f;
 
-        stdout2 = chk_non_negative(dup(STDIN_FILENO), "Preserving STDOUT before compressing");
-        chk_zero(pipe(rw), "Opening pipe from compressor subprocess");
-        gzpid = chk_non_negative(fork(), "Forking compressor subprocess");
-        if(gzpid==0) {
-                /* child */
-                chk_zero(close(rw[1]), "Closing write end of pipe in child");
-                chk_zero(close(STDIN_FILENO), "Closing STDIN");
-                chk_non_negative(dup2(rw[0],STDIN_FILENO), "Redirecting compressor input to stdin");
-                execlp(filter,filter,NULL);
-                _exit(-1);
-        }
-        /* parent */
-        chk_zero(close(rw[0]), "Closing read end of pipe");
-        chk_non_negative(dup2(rw[1],STDOUT_FILENO), "Redirecting output to compressor");
-
+        f.cmd = xstrdup(filter);
+        f.argv = malloc(2 * sizeof(char *));
+        f.argv[0] = f.cmd;
+        f.argv[1] = NULL;
+        cgit_open_filter(&f);
         rv = write_tar_archive(args);
-
-        chk_zero(close(STDOUT_FILENO), "Closing STDOUT redirected to compressor");
-        chk_non_negative(dup2(stdout2,STDOUT_FILENO), "Restoring uncompressed STDOUT");
-        chk_zero(close(stdout2), "Closing uncompressed STDOUT");
-        chk_zero(close(rw[1]), "Closing write end of pipe in parent");
-        chk_positive(waitpid(gzpid,&status,0), "Waiting on compressor process");
-        if(! ( WIFEXITED(status) && WEXITSTATUS(status)==0 ) )
-                cgit_print_error("Failed to compress archive");
-
+        cgit_close_filter(&f);
         return rv;
 }
 
diff --git a/ui-summary.c b/ui-summary.c
index ede4a62..a2c018e 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -66,11 +66,27 @@ void cgit_print_summary()
         html("</table>");
 }
 
-void cgit_print_repo_readme()
+void cgit_print_repo_readme(char *path)
 {
-        if (ctx.repo->readme) {
-                html("<div id='summary'>");
-                html_include(ctx.repo->readme);
-                html("</div>");
-        }
+        char *slash, *tmp;
+
+        if (!ctx.repo->readme)
+                return;
+
+        if (path) {
+                slash = strrchr(ctx.repo->readme, '/');
+                if (!slash)
+                        return;
+                tmp = xmalloc(slash - ctx.repo->readme + 1 + strlen(path) + 1);
+                strncpy(tmp, ctx.repo->readme, slash - ctx.repo->readme + 1);
+                strcpy(tmp + (slash - ctx.repo->readme + 1), path);
+        } else
+                tmp = ctx.repo->readme;
+        html("<div id='summary'>");
+        if (ctx.repo->about_filter)
+                cgit_open_filter(ctx.repo->about_filter);
+        html_include(tmp);
+        if (ctx.repo->about_filter)
+                cgit_close_filter(ctx.repo->about_filter);
+        html("</div>");
 }
diff --git a/ui-summary.h b/ui-summary.h
index 3e13039..c01f560 100644
--- a/ui-summary.h
+++ b/ui-summary.h
@@ -2,6 +2,6 @@
 #define UI_SUMMARY_H
 
 extern void cgit_print_summary();
-extern void cgit_print_repo_readme();
+extern void cgit_print_repo_readme(char *path);
 
 #endif /* UI_SUMMARY_H */
diff --git a/ui-tag.c b/ui-tag.c
index 8c263ab..c2d72af 100644
--- a/ui-tag.c
+++ b/ui-tag.c
@@ -67,7 +67,7 @@ void cgit_print_tag(char *revname)
                 if (info->tagger) {
                         html("<tr><td>Tagged by</td><td>");
                         html_txt(info->tagger);
-                        if (info->tagger_email) {
+                        if (info->tagger_email && !ctx.cfg.noplainemail) {
                                 html(" ");
                                 html_txt(info->tagger_email);
                         }
diff --git a/ui-tree.c b/ui-tree.c
index 553dbaa..c608754 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -15,13 +15,23 @@ char *curr_rev;
 char *match_path;
 int header = 0;
 
-static void print_text_buffer(char *buf, unsigned long size)
+static void print_text_buffer(const char *name, char *buf, unsigned long size)
 {
         unsigned long lineno, idx;
         const char *numberfmt =
                 "<a class='no' id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a>\n";
 
         html("<table summary='blob content' class='blob'>\n");
+        if (ctx.repo->source_filter) {
+                html("<tr><td class='lines'><pre><code>");
+                ctx.repo->source_filter->argv[1] = xstrdup(name);
+                cgit_open_filter(ctx.repo->source_filter);
+                write(STDOUT_FILENO, buf, size);
+                cgit_close_filter(ctx.repo->source_filter);
+                html("</code></pre></td></tr></table>\n");
+                return;
+        }
+
         html("<tr><td class='linenumbers'><pre>");
         idx = 0;
         lineno = 0;
@@ -65,7 +75,7 @@ static void print_binary_buffer(char *buf, unsigned long size)
         html("</table>\n");
 }
 
-static void print_object(const unsigned char *sha1, char *path)
+static void print_object(const unsigned char *sha1, char *path, const char *basename)
 {
         enum object_type type;
         char *buf;
@@ -93,7 +103,7 @@ static void print_object(const unsigned char *sha1, char *path)
         if (buffer_is_binary(buf, size))
                 print_binary_buffer(buf, size);
         else
-                print_text_buffer(buf, size);
+                print_text_buffer(basename, buf, size);
 }
 
 
@@ -103,6 +113,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
 {
         char *name;
         char *fullpath;
+        char *class;
         enum object_type type;
         unsigned long size = 0;
 
@@ -135,7 +146,12 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
                 cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head,
                                curr_rev, fullpath);
         } else {
-                cgit_tree_link(name, NULL, "ls-blob", ctx.qry.head,
+                class = strrchr(name, '.');
+                if (class != NULL) {
+                        class = fmt("ls-blob %s", class + 1);
+                } else
+                        class = "ls-blob";
+                cgit_tree_link(name, NULL, class, ctx.qry.head,
                                curr_rev, fullpath);
         }
         htmlf("</td><td class='ls-size'>%li</td>", size);
@@ -213,7 +229,7 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
                         ls_head();
                         return READ_TREE_RECURSIVE;
                 } else {
-                        print_object(sha1, buffer);
+                        print_object(sha1, buffer, pathname);
                         return 0;
                 }
         }