Merge pull request #832 from vktg/squididnacl

pfsense · Apr 6, 2020 · 6278bf8 · 6278bf8
2 parents 763a875 + f96b2d0
commit 6278bf8
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/www/pfSense-pkg-squid/files/usr/local/pkg/squid.inc b/www/pfSense-pkg-squid/files/usr/local/pkg/squid.inc
@@ -71,7 +71,8 @@ require_once('/usr/local/pkg/squid_antivirus.inc');
 
 /* Handle base64 encoding and linebreaks in textarea configuration fields */
 function sq_text_area_decode($text) {
-	return preg_replace('/\r\n/', "\n", base64_decode($text));
+	$contents = preg_replace('/\r\n/', "\n", base64_decode($text));
+	return implode("\n", array_map('idn_to_ascii', explode("\n", $contents)));
 }
 
 /* Get interface IP and netmask for Squid interfaces */