File tree Expand file tree Collapse file tree 8 files changed +22
-19
lines changed Expand file tree Collapse file tree 8 files changed +22
-19
lines changed Original file line number Diff line number Diff line change @@ -6,14 +6,14 @@ open System.Reflection
6
6
[<assembly: AssemblyProductAttribute( " HttpFs.IntegrationTests" ) >]
7
7
[<assembly: AssemblyCopyrightAttribute( " Copyright © 2018" ) >]
8
8
[<assembly: AssemblyDescriptionAttribute( " A simple, functional HTTP client library for F#" ) >]
9
- [<assembly: AssemblyVersionAttribute( " 5.2.1 " ) >]
10
- [<assembly: AssemblyFileVersionAttribute( " 5.2.1 " ) >]
9
+ [<assembly: AssemblyVersionAttribute( " 5.3.0 " ) >]
10
+ [<assembly: AssemblyFileVersionAttribute( " 5.3.0 " ) >]
11
11
do ()
12
12
13
13
module internal AssemblyVersionInformation =
14
14
let [<Literal>] AssemblyTitle = " HttpFs.IntegrationTests"
15
15
let [<Literal>] AssemblyProduct = " HttpFs.IntegrationTests"
16
16
let [<Literal>] AssemblyCopyright = " Copyright © 2018"
17
17
let [<Literal>] AssemblyDescription = " A simple, functional HTTP client library for F#"
18
- let [<Literal>] AssemblyVersion = " 5.2.1 "
19
- let [<Literal>] AssemblyFileVersion = " 5.2.1 "
18
+ let [<Literal>] AssemblyVersion = " 5.3.0 "
19
+ let [<Literal>] AssemblyFileVersion = " 5.3.0 "
Original file line number Diff line number Diff line change @@ -52,19 +52,19 @@ let app =
52
52
Filters.path " /MoonLanguageTextPlainNoEncoding"
53
53
>=> Writers.setHeader " Content-Type" " text/plain"
54
54
>=> warbler ( fun _ ->
55
- Encoding.GetEncoding ( " windows-1251 " ) .GetBytes( " яЏ§§їДЙ" )
55
+ Encoding.UTF8 .GetBytes( " яЏ§§їДЙ" )
56
56
|> Successful.ok)
57
57
58
58
Filters.path " /MoonLanguageApplicationXmlNoEncoding"
59
59
>=> Writers.setHeader " Content-Type" " application/xml"
60
60
>=> warbler ( fun _ ->
61
- Encoding.GetEncoding ( " windows-1251 " ) .GetBytes( " яЏ§§їДЙ" )
61
+ Encoding.UTF8 .GetBytes( " яЏ§§їДЙ" )
62
62
|> Successful.ok)
63
63
64
64
Filters.path " /MoonLanguageInvalidEncoding"
65
65
>=> Writers.setHeader " Content-Type" " text/plain; charset=Ninky-Nonk"
66
66
>=> warbler ( fun _ ->
67
- Encoding.GetEncoding ( " windows-1251 " ) .GetBytes( " яЏ§§їДЙ" )
67
+ Encoding.UTF8 .GetBytes( " яЏ§§їДЙ" )
68
68
|> Successful.ok)
69
69
70
70
Filters.path " /utf8"
Original file line number Diff line number Diff line change @@ -294,8 +294,8 @@ let tests =
294
294
Expect.equal responseBodyString " яЏ§§їДЙ" " body should be equal"
295
295
}
296
296
297
- testCaseAsync " response charset IS NOT SPECIFIED, NO Content-Type header, body read by default as Latin 1 " <| async {
298
- let expected = " ÿ§§¿ÄÉ " // " яЏ§§їДЙ" (as encoded with windows-1251) decoded with ISO-8859-1 (Latin 1)
297
+ testCaseAsync " response charset IS NOT SPECIFIED, NO Content-Type header, body read by default as UTF8 " <| async {
298
+ let expected = " яЏ§§їДЙ"
299
299
300
300
let! response =
301
301
Request.create Get ( uriFor " /MoonLanguageTextPlainNoEncoding" )
Original file line number Diff line number Diff line change @@ -6,14 +6,14 @@ open System.Reflection
6
6
[<assembly: AssemblyProductAttribute( " HttpFs.UnitTests" ) >]
7
7
[<assembly: AssemblyCopyrightAttribute( " Copyright © 2018" ) >]
8
8
[<assembly: AssemblyDescriptionAttribute( " A simple, functional HTTP client library for F#" ) >]
9
- [<assembly: AssemblyVersionAttribute( " 5.2.1 " ) >]
10
- [<assembly: AssemblyFileVersionAttribute( " 5.2.1 " ) >]
9
+ [<assembly: AssemblyVersionAttribute( " 5.3.0 " ) >]
10
+ [<assembly: AssemblyFileVersionAttribute( " 5.3.0 " ) >]
11
11
do ()
12
12
13
13
module internal AssemblyVersionInformation =
14
14
let [<Literal>] AssemblyTitle = " HttpFs.UnitTests"
15
15
let [<Literal>] AssemblyProduct = " HttpFs.UnitTests"
16
16
let [<Literal>] AssemblyCopyright = " Copyright © 2018"
17
17
let [<Literal>] AssemblyDescription = " A simple, functional HTTP client library for F#"
18
- let [<Literal>] AssemblyVersion = " 5.2.1 "
19
- let [<Literal>] AssemblyFileVersion = " 5.2.1 "
18
+ let [<Literal>] AssemblyVersion = " 5.3.0 "
19
+ let [<Literal>] AssemblyFileVersion = " 5.3.0 "
Original file line number Diff line number Diff line change @@ -6,14 +6,14 @@ open System.Reflection
6
6
[<assembly: AssemblyProductAttribute( " HttpFs" ) >]
7
7
[<assembly: AssemblyCopyrightAttribute( " Copyright © 2018" ) >]
8
8
[<assembly: AssemblyDescriptionAttribute( " A simple, functional HTTP client library for F#" ) >]
9
- [<assembly: AssemblyVersionAttribute( " 5.2.1 " ) >]
10
- [<assembly: AssemblyFileVersionAttribute( " 5.2.1 " ) >]
9
+ [<assembly: AssemblyVersionAttribute( " 5.3.0 " ) >]
10
+ [<assembly: AssemblyFileVersionAttribute( " 5.3.0 " ) >]
11
11
do ()
12
12
13
13
module internal AssemblyVersionInformation =
14
14
let [<Literal>] AssemblyTitle = " HttpFs"
15
15
let [<Literal>] AssemblyProduct = " HttpFs"
16
16
let [<Literal>] AssemblyCopyright = " Copyright © 2018"
17
17
let [<Literal>] AssemblyDescription = " A simple, functional HTTP client library for F#"
18
- let [<Literal>] AssemblyVersion = " 5.2.1 "
19
- let [<Literal>] AssemblyFileVersion = " 5.2.1 "
18
+ let [<Literal>] AssemblyVersion = " 5.3.0 "
19
+ let [<Literal>] AssemblyFileVersion = " 5.3.0 "
Original file line number Diff line number Diff line change @@ -1003,7 +1003,7 @@ module Client =
1003
1003
| None ->
1004
1004
match response.characterSet with
1005
1005
| None ->
1006
- ISOLatin1 // TODO: change to UTF-8
1006
+ Encoding.UTF8
1007
1007
| Some responseCharset ->
1008
1008
try Encoding.GetEncoding( mapEncoding responseCharset)
1009
1009
with _ -> Encoding.UTF8
Original file line number Diff line number Diff line change 3
3
<PropertyGroup >
4
4
<AssemblyName >HttpFs</AssemblyName >
5
5
<PackageId >Http.fs</PackageId >
6
- <Version >5.2.1 </Version >
6
+ <Version >5.3.0 </Version >
7
7
<TargetFrameworks >netstandard2.0;net471</TargetFrameworks >
8
8
</PropertyGroup >
9
9
<ItemGroup >
Original file line number Diff line number Diff line change
1
+ #### 5.3.0 — 2018-06-27
2
+ * Default non-specified charsets to UTF8 rather than Latin 1.
3
+
1
4
#### 5.2.1 — 2018-06-07
2
5
* Allow adding Authorization header without HttpClient validating it.
3
6
You can’t perform that action at this time.
0 commit comments