Merge branch 'ml/head-include'

4 files changed, 10 insertions, 1 deletions

diff --git a/cgit.c b/cgit.c
index ae20257..513ea12 100644
--- a/cgit.c
+++ b/cgit.c
@@ -33,2 +33,4 @@ void config_cb(const char *name, const char *value)
 		ctx.cfg.footer = xstrdup(value);
+	else if (!strcmp(name, "head-include"))
+		ctx.cfg.head_include = xstrdup(value);
 	else if (!strcmp(name, "header"))
diff --git a/cgit.h b/cgit.h
index 07a277a..78b30ba 100644
--- a/cgit.h
+++ b/cgit.h
@@ -138,2 +138,3 @@ struct cgit_config {
 	char *footer;
+	char *head_include;
 	char *header;
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 7879f75..683f3b5 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -86,2 +86,6 @@ footer::
 
+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::
diff --git a/ui-shared.c b/ui-shared.c
index 10be3c0..66d5b82 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -518,4 +518,6 @@ void cgit_print_docstart(struct cgit_context *ctx)
 				       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");