Latin1 default to UTF8 default

haf · Jun 27, 2018 · 6fa93c8 · 6fa93c8
1 parent 52bb2d4
commit 6fa93c8
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 19 deletions.
diff --git a/HttpFs.IntegrationTests/AssemblyInfo.fs b/HttpFs.IntegrationTests/AssemblyInfo.fs
@@ -6,14 +6,14 @@ open System.Reflection
 [<assembly: AssemblyProductAttribute("HttpFs.IntegrationTests")>]
 [<assembly: AssemblyCopyrightAttribute("Copyright © 2018")>]
 [<assembly: AssemblyDescriptionAttribute("A simple, functional HTTP client library for F#")>]
-[<assembly: AssemblyVersionAttribute("5.2.1")>]
-[<assembly: AssemblyFileVersionAttribute("5.2.1")>]
+[<assembly: AssemblyVersionAttribute("5.3.0")>]
+[<assembly: AssemblyFileVersionAttribute("5.3.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "HttpFs.IntegrationTests"
     let [<Literal>] AssemblyProduct = "HttpFs.IntegrationTests"
     let [<Literal>] AssemblyCopyright = "Copyright © 2018"
     let [<Literal>] AssemblyDescription = "A simple, functional HTTP client library for F#"
-    let [<Literal>] AssemblyVersion = "5.2.1"
-    let [<Literal>] AssemblyFileVersion = "5.2.1"
+    let [<Literal>] AssemblyVersion = "5.3.0"
+    let [<Literal>] AssemblyFileVersion = "5.3.0"
diff --git a/HttpFs.IntegrationTests/HttpServer.fs b/HttpFs.IntegrationTests/HttpServer.fs
@@ -52,19 +52,19 @@ let app =
       Filters.path "/MoonLanguageTextPlainNoEncoding"
         >=> Writers.setHeader "Content-Type" "text/plain"
         >=> warbler (fun _ ->
-            Encoding.GetEncoding("windows-1251").GetBytes("яЏ§§їДЙ")
+            Encoding.UTF8.GetBytes("яЏ§§їДЙ")
             |> Successful.ok)
 
       Filters.path "/MoonLanguageApplicationXmlNoEncoding"
         >=> Writers.setHeader "Content-Type" "application/xml"
         >=> warbler (fun _ ->
-            Encoding.GetEncoding("windows-1251").GetBytes("яЏ§§їДЙ")
+            Encoding.UTF8.GetBytes("яЏ§§їДЙ")
             |> Successful.ok)
 
       Filters.path "/MoonLanguageInvalidEncoding"
         >=> Writers.setHeader "Content-Type" "text/plain; charset=Ninky-Nonk"
         >=> warbler (fun _ ->
-          Encoding.GetEncoding("windows-1251").GetBytes("яЏ§§їДЙ")
+          Encoding.UTF8.GetBytes("яЏ§§їДЙ")
           |> Successful.ok)
 
       Filters.path "/utf8"

diff --git a/HttpFs.IntegrationTests/Tests.fs b/HttpFs.IntegrationTests/Tests.fs
@@ -294,8 +294,8 @@ let tests =
       Expect.equal responseBodyString "яЏ§§їДЙ" "body should be equal"
     }
 
-    testCaseAsync "response charset IS NOT SPECIFIED, NO Content-Type header, body read by default as Latin 1" <| async {
-      let expected = "ÿ§§¿ÄÉ" // "яЏ§§їДЙ" (as encoded with windows-1251) decoded with ISO-8859-1 (Latin 1)
+    testCaseAsync "response charset IS NOT SPECIFIED, NO Content-Type header, body read by default as UTF8" <| async {
+      let expected = "яЏ§§їДЙ"
 
       let! response =
         Request.create Get (uriFor "/MoonLanguageTextPlainNoEncoding")

diff --git a/HttpFs.UnitTests/AssemblyInfo.fs b/HttpFs.UnitTests/AssemblyInfo.fs
@@ -6,14 +6,14 @@ open System.Reflection
 [<assembly: AssemblyProductAttribute("HttpFs.UnitTests")>]
 [<assembly: AssemblyCopyrightAttribute("Copyright © 2018")>]
 [<assembly: AssemblyDescriptionAttribute("A simple, functional HTTP client library for F#")>]
-[<assembly: AssemblyVersionAttribute("5.2.1")>]
-[<assembly: AssemblyFileVersionAttribute("5.2.1")>]
+[<assembly: AssemblyVersionAttribute("5.3.0")>]
+[<assembly: AssemblyFileVersionAttribute("5.3.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "HttpFs.UnitTests"
     let [<Literal>] AssemblyProduct = "HttpFs.UnitTests"
     let [<Literal>] AssemblyCopyright = "Copyright © 2018"
     let [<Literal>] AssemblyDescription = "A simple, functional HTTP client library for F#"
-    let [<Literal>] AssemblyVersion = "5.2.1"
-    let [<Literal>] AssemblyFileVersion = "5.2.1"
+    let [<Literal>] AssemblyVersion = "5.3.0"
+    let [<Literal>] AssemblyFileVersion = "5.3.0"
diff --git a/HttpFs/AssemblyInfo.fs b/HttpFs/AssemblyInfo.fs
@@ -6,14 +6,14 @@ open System.Reflection
 [<assembly: AssemblyProductAttribute("HttpFs")>]
 [<assembly: AssemblyCopyrightAttribute("Copyright © 2018")>]
 [<assembly: AssemblyDescriptionAttribute("A simple, functional HTTP client library for F#")>]
-[<assembly: AssemblyVersionAttribute("5.2.1")>]
-[<assembly: AssemblyFileVersionAttribute("5.2.1")>]
+[<assembly: AssemblyVersionAttribute("5.3.0")>]
+[<assembly: AssemblyFileVersionAttribute("5.3.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "HttpFs"
     let [<Literal>] AssemblyProduct = "HttpFs"
     let [<Literal>] AssemblyCopyright = "Copyright © 2018"
     let [<Literal>] AssemblyDescription = "A simple, functional HTTP client library for F#"
-    let [<Literal>] AssemblyVersion = "5.2.1"
-    let [<Literal>] AssemblyFileVersion = "5.2.1"
+    let [<Literal>] AssemblyVersion = "5.3.0"
+    let [<Literal>] AssemblyFileVersion = "5.3.0"
diff --git a/HttpFs/HttpFs.fs b/HttpFs/HttpFs.fs
@@ -1003,7 +1003,7 @@ module Client =
           | None ->
             match response.characterSet with
             | None ->
-              ISOLatin1 // TODO: change to UTF-8
+              Encoding.UTF8
             | Some responseCharset ->
               try Encoding.GetEncoding(mapEncoding responseCharset)
               with _ -> Encoding.UTF8

diff --git a/HttpFs/HttpFs.fsproj b/HttpFs/HttpFs.fsproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <AssemblyName>HttpFs</AssemblyName>
     <PackageId>Http.fs</PackageId>
-    <Version>5.2.1</Version>
+    <Version>5.3.0</Version>
     <TargetFrameworks>netstandard2.0;net471</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+#### 5.3.0 — 2018-06-27
+* Default non-specified charsets to UTF8 rather than Latin 1.
+
 #### 5.2.1 — 2018-06-07
 * Allow adding Authorization header without HttpClient validating it.