13 files changed, 177 insertions, 82 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 0f0089a..707d446 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-CGIT_VERSION = v0.8.2
+CGIT_VERSION = v0.8.2.1
 CGIT_SCRIPT_NAME = cgit.cgi
 CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
 CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
@@ -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 38f0fdd..2039ab1 100644
--- a/cgit.c
+++ b/cgit.c
@@ -31,6 +31,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"))
@@ -210,6 +212,7 @@ static void prepare_context(struct cgit_context *ctx)
         ctx->page.size = 0;
         ctx->page.modified = time(NULL);
         ctx->page.expires = ctx->page.modified;
+        ctx->page.etag = NULL;
 }
 
 struct refmatch {
@@ -289,6 +292,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);
@@ -433,6 +438,7 @@ static int calc_ttl()
 int main(int argc, const char **argv)
 {
         const char *cgit_config_env = getenv("CGIT_CONFIG");
+        const char *method = getenv("REQUEST_METHOD");
         const char *path;
         char *qry;
         int err, ttl;
@@ -479,6 +485,8 @@ int main(int argc, const char **argv)
 
         ttl = calc_ttl();
         ctx.page.expires += ttl*60;
+        if (method && !strcmp(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.h b/cgit.h
index ca01705..8c64efe 100644
--- a/cgit.h
+++ b/cgit.h
@@ -136,6 +136,7 @@ struct cgit_config {
         char *css;
         char *favicon;
         char *footer;
+        char *head_include;
         char *header;
         char *index_header;
         char *index_info;
@@ -182,7 +183,10 @@ struct cgit_page {
         char *mimetype;
         char *charset;
         char *filename;
+        char *etag;
         char *title;
+        int status;
+        char *statusmsg;
 };
 
 struct cgit_context {
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 771bb7d..a207fe0 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -1,14 +1,14 @@
-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.
@@ -16,175 +16,179 @@ lines, and lines starting with '#', are ignored.
 
 GLOBAL SETTINGS
 ---------------
-agefile
+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
+css::
         Url which specifies the css document to include in all cgit pages.
         Default value: "/cgit.css".
 
-embedded
+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
+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.
 
-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
+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::