From 997771613b0b40fa6b973e741773e564fd241534 Mon Sep 17 00:00:00 2001
From: Chris Morgan <me@chrismorgan.info>
Date: Sat, 8 Jan 2022 19:18:36 +1100
Subject: [PATCH] Cope with non-ASCII $site_name

---
 gitweb.cgi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gitweb.cgi b/gitweb.cgi
index 91047b0..28a64ea 100755
--- a/gitweb.cgi
+++ b/gitweb.cgi
@@ -4086,11 +4086,11 @@ sub print_feed_meta {
 	} else {
 		printf('<link rel="alternate" title="%s projects list" '.
 		       'href="%s" type="text/plain; charset=utf-8" />'."\n",
-		       esc_attr($site_name),
+		       esc_attr(to_utf8($site_name)),
 		       esc_attr(href(project=>undef, action=>"project_index")));
 		printf('<link rel="alternate" title="%s projects feeds" '.
 		       'href="%s" type="text/x-opml" />'."\n",
-		       esc_attr($site_name),
+		       esc_attr(to_utf8($site_name)),
 		       esc_attr(href(project=>undef, action=>"opml")));
 	}
 }
@@ -8218,7 +8218,7 @@ sub git_feed {
 	return if ($cgi->request_method() eq 'HEAD');
 
 	# header variables
-	my $title = "$site_name - $project/$action";
+	my $title = to_utf8($site_name) . " - $project/$action";
 	my $feed_type = 'log';
 	if (defined $hash) {
 		$title .= " - '$hash'";
@@ -8381,7 +8381,7 @@ sub git_opml {
 		-charset => 'utf-8',
 		-content_disposition => 'inline; filename="opml.xml"');
 
-	my $title = esc_html($site_name);
+	my $title = esc_html(to_utf8($site_name));
 	my $filter = " within subdirectory ";
 	if (defined $project_filter) {
 		$filter .= esc_html($project_filter);
-- 
2.42.0