3 files changed, 4 insertions, 34 deletions

diff --git a/source/cgit.c b/source/cgit.cindex 5af2232..74600a7 100644--- a/source/cgit.c+++ b/source/cgit.c@@ -211,8 +211,6 @@ static void config_cb(const char *name, const char *value) 		ctx.cfg.enable_tree_linenumbers = atoi(value); 	else if (!strcmp(name, "enable-tree-group-dirs")) 		ctx.cfg.enable_tree_group_dirs = atoi(value);-	else if (!strcmp(name, "enable-markdown"))-		ctx.cfg.enable_markdown = atoi(value); 	else if (!strcmp(name, "enable-git-config")) 		ctx.cfg.enable_git_config = atoi(value); 	else if (!strcmp(name, "enable-cache-list"))@@ -420,7 +418,6 @@ static void prepare_context(void) 	ctx.cfg.enable_http_clone = 1; 	ctx.cfg.enable_index_owner = 1; 	ctx.cfg.enable_tree_linenumbers = 1;-	ctx.cfg.enable_markdown = 1; 	ctx.cfg.enable_git_config = 0; 	ctx.cfg.max_repo_count = 50; 	ctx.cfg.max_commit_count = 50;
diff --git a/source/cgit.c b/source/cgit.c
index 5af2232..74600a7 100644
--- a/source/cgit.c
+++ b/source/cgit.c
@@ -211,8 +211,6 @@ static void config_cb(const char *name, const char *value)
 		ctx.cfg.enable_tree_linenumbers = atoi(value);
 	else if (!strcmp(name, "enable-tree-group-dirs"))
 		ctx.cfg.enable_tree_group_dirs = atoi(value);
-	else if (!strcmp(name, "enable-markdown"))
-		ctx.cfg.enable_markdown = atoi(value);
 	else if (!strcmp(name, "enable-git-config"))
 		ctx.cfg.enable_git_config = atoi(value);
 	else if (!strcmp(name, "enable-cache-list"))
@@ -420,7 +418,6 @@ static void prepare_context(void)
 	ctx.cfg.enable_http_clone = 1;
 	ctx.cfg.enable_index_owner = 1;
 	ctx.cfg.enable_tree_linenumbers = 1;
-	ctx.cfg.enable_markdown = 1;
 	ctx.cfg.enable_git_config = 0;
 	ctx.cfg.max_repo_count = 50;
 	ctx.cfg.max_commit_count = 50;
diff --git a/source/cgit.h b/source/cgit.hindex b7caaf5..966851c 100644--- a/source/cgit.h+++ b/source/cgit.h@@ -243,7 +243,6 @@ struct cgit_config { 	int enable_html_serving; 	int enable_tree_linenumbers; 	int enable_tree_group_dirs;-	int enable_markdown; 	int enable_git_config; 	int enable_cache_list; 	int local_time;
diff --git a/source/cgit.h b/source/cgit.h
index b7caaf5..966851c 100644
--- a/source/cgit.h
+++ b/source/cgit.h
@@ -243,7 +243,6 @@ struct cgit_config {
 	int enable_html_serving;
 	int enable_tree_linenumbers;
 	int enable_tree_group_dirs;
-	int enable_markdown;
 	int enable_git_config;
 	int enable_cache_list;
 	int local_time;
diff --git a/source/ui-summary.c b/source/ui-summary.cindex 8dd191b..80d1e5b 100644--- a/source/ui-summary.c+++ b/source/ui-summary.c@@ -105,17 +105,6 @@ static char* append_readme_path(const char *filename, const char *ref, const cha 	return full_path; } -static int readme_is_markdown(const char *filename)-{-	const char *ext = strrchr(filename, '.');--	if (!ext || !ext[1])-		return 0;-	ext++;-	return !strcasecmp(ext, "md") || !strcasecmp(ext, "markdown") ||-	       !strcasecmp(ext, "mkd") || !strcasecmp(ext, "mdown");-}- void cgit_print_repo_readme(const char *path) { 	char *filename, *ref, *mimetype;@@ -146,29 +135,14 @@ void cgit_print_repo_readme(const char *path) 	}  	html("<div id='summary'>");-	if (!ctx.repo->about_filter && ctx.cfg.enable_markdown &&-	    readme_is_markdown(filename)) {-		/* No about-filter is set, so hand the markdown source to the-		 * built-in client-side renderer in cgit.js. The source is-		 * escaped here and rendered in the browser, and it degrades to-		 * readable plain text when scripting is off.-		 */-		html("<div class='markdown' data-markdown>");-		if (ref) {-			cgit_print_file(filename, ref, 1, 1);-		} else {-			struct strbuf sb = STRBUF_INIT;-			if (strbuf_read_file(&sb, filename, 0) >= 0)-				html_txt(sb.buf);-			strbuf_release(&sb);-		}-		html("</div>");-	} else if (!ctx.repo->about_filter) {+	if (!ctx.repo->about_filter) { 		/* No about-filter is configured, so there is nothing to turn 		 * the readme source into safe HTML. Escape it rather than serve 		 * repo content raw, which would let an untrusted repository 		 * inject script into the about page. The pre keeps the line-		 * structure of the text, which bare escaped output loses.+		 * structure of the text, which bare escaped output loses. Point+		 * about-filter at the bundled about-render.lua to render a+		 * markdown or man readme instead, see cgitrc.5.txt. 		 */ 		html("<pre class='plaintext'>"); 		if (ref) {
diff --git a/source/ui-summary.c b/source/ui-summary.c
index 8dd191b..80d1e5b 100644
--- a/source/ui-summary.c
+++ b/source/ui-summary.c
@@ -105,17 +105,6 @@ static char* append_readme_path(const char *filename, const char *ref, const cha
 	return full_path;
 }
 
-static int readme_is_markdown(const char *filename)
-{
-	const char *ext = strrchr(filename, '.');
-
-	if (!ext || !ext[1])
-		return 0;
-	ext++;
-	return !strcasecmp(ext, "md") || !strcasecmp(ext, "markdown") ||
-	       !strcasecmp(ext, "mkd") || !strcasecmp(ext, "mdown");
-}
-
 void cgit_print_repo_readme(const char *path)
 {
 	char *filename, *ref, *mimetype;
@@ -146,29 +135,14 @@ void cgit_print_repo_readme(const char *path)
 	}
 
 	html("<div id='summary'>");
-	if (!ctx.repo->about_filter && ctx.cfg.enable_markdown &&
-	    readme_is_markdown(filename)) {
-		/* No about-filter is set, so hand the markdown source to the
-		 * built-in client-side renderer in cgit.js. The source is
-		 * escaped here and rendered in the browser, and it degrades to
-		 * readable plain text when scripting is off.
-		 */
-		html("<div class='markdown' data-markdown>");
-		if (ref) {
-			cgit_print_file(filename, ref, 1, 1);
-		} else {
-			struct strbuf sb = STRBUF_INIT;
-			if (strbuf_read_file(&sb, filename, 0) >= 0)
-				html_txt(sb.buf);
-			strbuf_release(&sb);
-		}
-		html("</div>");
-	} else if (!ctx.repo->about_filter) {
+	if (!ctx.repo->about_filter) {
 		/* No about-filter is configured, so there is nothing to turn
 		 * the readme source into safe HTML. Escape it rather than serve
 		 * repo content raw, which would let an untrusted repository
 		 * inject script into the about page. The pre keeps the line
-		 * structure of the text, which bare escaped output loses.
+		 * structure of the text, which bare escaped output loses. Point
+		 * about-filter at the bundled about-render.lua to render a
+		 * markdown or man readme instead, see cgitrc.5.txt.
 		 */
 		html("<pre class='plaintext'>");
 		if (ref) {