From e237d8fa974bd63da33887edd66b998095f44035 Mon Sep 17 00:00:00 2001
From: Jermolene <jeremy@jermolene.com>
Date: Fri, 24 Aug 2018 14:33:31 +0100
Subject: [PATCH] Transliterate servername to safe ASCII

Fixes #3410
---
 core/modules/server/server.js       | 2 +-
 core/modules/utils/transliterate.js | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/modules/server/server.js b/core/modules/server/server.js
index 1c8f9724f..4eb692df2 100644
--- a/core/modules/server/server.js
+++ b/core/modules/server/server.js
@@ -30,7 +30,7 @@ function Server(options) {
 	this.routes = options.routes || [];
 	this.authenticators = options.authenticators || [];
 	this.wiki = options.wiki;
-	this.servername = this.wiki.getTiddlerText("$:/SiteTitle") || "TiddlyWiki5";
+	this.servername = $tw.utils.transliterateToSafeASCII(this.wiki.getTiddlerText("$:/SiteTitle") || "TiddlyWiki5");
 	// Initialise the variables
 	this.variables = $tw.utils.extend({},this.defaultVariables);
 	if(options.variables) {
diff --git a/core/modules/utils/transliterate.js b/core/modules/utils/transliterate.js
index e69d9293f..275aa1d50 100644
--- a/core/modules/utils/transliterate.js
+++ b/core/modules/utils/transliterate.js
@@ -916,4 +916,10 @@ exports.transliterate = function(str) {
 	});
 };
 
+exports.transliterateToSafeASCII = function(str) {
+	return str.replace(/[^\x00-\x7F]/g,function(ch) {
+		return exports.transliterationPairs[ch] || ""
+	});
+};
+
 })();