From 985385bb3059480e0c3af352da2da8bb63c0095a Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 31 May 2018 08:23:22 +0200
Subject: [PATCH] U4-11375 - url segments are ascii by default

---
 .../config/umbracoSettings.Release.config     | 34 ++++++++++---------
 .../config/umbracoSettings.config             |  2 +-
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
index 9e8aa9c8d1..2eab2a86c0 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <settings>
 
-  <!-- 
-    umbracoSettings.config configuration documentation can be found here: 
-    http://our.umbraco.org/documentation/using-umbraco/config-files/umbracoSettings/
-    Many of the optional settings are not explicitly listed here 
-    but can be found in the online documentation.
+  <!--
+    umbracoSettings.config configuration documentation can be found here:
+    http://our.umbraco.org/documentation/using-umbraco/config-files/umbracoSettings/
+    Many of the optional settings are not explicitly listed here
+    but can be found in the online documentation.
     -->
 
     <backOffice>
         <tours enable="true"></tours>
     </backOffice>
-    
+
   <content>
-    
+
     <errors>
       <error404>1</error404>
-      <!-- 
+      <!--
         The value for error pages can be:
         * A content item's integer ID   (example: 1234)
         * A content item's GUID ID      (example: 26C1D84F-C900-4D53-B167-E25CC489DAC8)
@@ -27,9 +27,9 @@
             <errorPage culture="default">1</errorPage>
             <errorPage culture="en-US">200</errorPage>
         </error404>
-       -->      
+       -->
     </errors>
-    
+
     <notifications>
       <!-- the email that should be used as from mail when umbraco sends a notification -->
       <email>your@email.here</email>
@@ -58,10 +58,10 @@
 
     <!-- Enables value converters for all built in property editors so that they return strongly typed object, recommended for use with Models Builder -->
     <EnablePropertyValueConverters>true</EnablePropertyValueConverters>
-	
+
     <!-- You can specify your own background image for the login screen here. The image will automatically get an overlay to match back office colors - this path is relative to the ~/umbraco path. The default location is: /umbraco/assets/img/installer.jpg -->
     <loginBackgroundImage>assets/img/installer.jpg</loginBackgroundImage>
-      
+
   </content>
 
   <security>
@@ -77,7 +77,9 @@
     <!-- this will ensure that urls are unique when running with multiple root nodes -->
     <useDomainPrefixes>false</useDomainPrefixes>
     <!-- this will add a trailing slash (/) to urls when in directory url mode -->
-    <addTrailingSlash>true</addTrailingSlash>   
+    <addTrailingSlash>true</addTrailingSlash>
+    <!-- this ensures that all url segments are turned to ASCII -->
+    <urlReplacing toAscii="true" />
   </requestHandler>
 
   <templates>
@@ -90,7 +92,7 @@
     <!--    <task log="true" alias="test60" interval="60" url="http://localhost/umbraco/test.aspx"/>-->
   </scheduledTasks>
 
-  <!-- 
+  <!--
     web.routing
       @trySkipIisCustomErrors
         Tries to skip IIS custom errors.
@@ -106,11 +108,11 @@
       @disableAlternativeTemplates
         By default you can add a altTemplate querystring or append a template name to the current URL which
         will make Umbraco render the content on the current page with the template you requested, for example:
-        http://mysite.com/about-us/?altTemplate=Home and http://mysite.com/about-us/Home would render the 
+        http://mysite.com/about-us/?altTemplate=Home and http://mysite.com/about-us/Home would render the
         "About Us" page with a template with the alias Home. Setting this setting to true stops that behavior
       @disableFindContentByIdPath
         By default you can call any content Id in the url and show the content with that id, for example:
-        http://mysite.com/1092 or http://mysite.com/1092.aspx would render the content with id 1092. Setting 
+        http://mysite.com/1092 or http://mysite.com/1092.aspx would render the content with id 1092. Setting
         this setting to true stops that behavior
       @umbracoApplicationUrl
         The url of the Umbraco application. By default, Umbraco will figure it out from the first request.
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index 35e097111c..61dcbf7530 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -133,7 +133,7 @@
     <useDomainPrefixes>false</useDomainPrefixes>
     <!-- this will add a trailing slash (/) to urls when in directory url mode -->
     <addTrailingSlash>true</addTrailingSlash>
-    <urlReplacing removeDoubleDashes="true">
+    <urlReplacing removeDoubleDashes="true" toAscii="true">
       <char org=" ">-</char>
       <char org="&quot;"></char>
       <char org="'"></char>