add back encoding and disable utf8 bom

dragonfruitnetwork · Aug 21, 2021 · 52f06fe · 52f06fe
1 parent 446b15c
commit 52f06fe
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/DragonFruit.Common.Data/Serializers/ApiJsonSerializer.cs b/DragonFruit.Common.Data/Serializers/ApiJsonSerializer.cs
@@ -64,7 +64,7 @@ private ApiJsonSerializer(Encoding encoding, bool autoDetectEncoding)
 
         public Encoding Encoding
         {
-            get => _encoding ?? Encoding.UTF8;
+            get => _encoding ?? new UTF8Encoding(false);
             set => _encoding = value;
         }
 
@@ -83,7 +83,7 @@ public HttpContent Serialize<T>(T input) where T : class
                 Serializer.Serialize(jsonWriter, input);
             }
 
-            return SerializerUtils.ProcessStream(this, stream, Encoding);
+            return SerializerUtils.ProcessStream(this, stream);
         }
 
         public T Deserialize<T>(Stream input) where T : class

diff --git a/DragonFruit.Common.Data/Serializers/ApiXmlSerializer.cs b/DragonFruit.Common.Data/Serializers/ApiXmlSerializer.cs
@@ -23,7 +23,7 @@ public ApiXmlSerializer(Encoding encoding = null, bool autoDetectEncoding = true
 
         public Encoding Encoding
         {
-            get => _encoding ?? Encoding.UTF8;
+            get => _encoding ?? new UTF8Encoding(false);
             set => _encoding = value;
         }
 
@@ -38,7 +38,7 @@ public HttpContent Serialize<T>(T input) where T : class
                 new XmlSerializer(typeof(T)).Serialize(writer, input);
             }
 
-            return SerializerUtils.ProcessStream(this, stream, Encoding);
+            return SerializerUtils.ProcessStream(this, stream);
         }
 
         public T Deserialize<T>(Stream input) where T : class

diff --git a/DragonFruit.Common.Data/Utils/SerializerUtils.cs b/DragonFruit.Common.Data/Utils/SerializerUtils.cs
@@ -4,20 +4,22 @@
 using System.IO;
 using System.Net.Http;
 using System.Net.Http.Headers;
-using System.Text;
 using DragonFruit.Common.Data.Serializers;
 
 namespace DragonFruit.Common.Data.Utils
 {
     public static class SerializerUtils
     {
-        public static HttpContent ProcessStream(ISerializer serializer, Stream stream, Encoding encoding)
+        public static HttpContent ProcessStream(ISerializer serializer, Stream stream)
         {
             stream.Seek(0, SeekOrigin.Begin);
             var content = new StreamContent(stream);
 
             content.Headers.ContentLength = stream.Length;
-            content.Headers.ContentType = new MediaTypeHeaderValue(serializer.ContentType);
+            content.Headers.ContentType = new MediaTypeHeaderValue(serializer.ContentType)
+            {
+                CharSet = serializer.Encoding.HeaderName
+            };
 
             return content;
         }