Merge pull request #634 from lhyqy5/issue-625-output-encoding-error

Fix #625: xml output encoding don't match writer setting
reactiveui · Mar 12, 2019 · 4c8febe · 4c8febe
2 parents a124fb5 + 33832ff
commit 4c8febe
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/Refit.Tests/XmlContentSerializerTests.cs b/Refit.Tests/XmlContentSerializerTests.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Net.Http;
+using System.Text;
 using System.Threading.Tasks;
 using System.Xml;
+using System.Xml.Linq;
 using System.Xml.Serialization;
 using Xunit;
 
@@ -92,6 +94,29 @@ public async Task ShouldDeserializeFromXmlAsync()
             Assert.Equal("123", dto.Identifier);
         }
 
+        [Fact]
+        public async Task XmlEncodingShouldMatchWriterSettingAsync()
+        {
+            var encoding = Encoding.UTF7;
+            var serializerSettings = new XmlContentSerializerSettings
+            {
+                XmlReaderWriterSettings = new XmlReaderWriterSettings()
+                {
+                    WriterSettings = new XmlWriterSettings()
+                    {
+                        Encoding = encoding
+                    }
+                }
+            };
+            var sut = new XmlContentSerializer(serializerSettings);
+
+            var dto = BuildDto();
+            var content = await sut.SerializeAsync(dto);
+            var xml = XDocument.Parse(await content.ReadAsStringAsync());
+            var documentEncoding = xml.Declaration.Encoding;
+            Assert.Equal(encoding.WebName, documentEncoding);
+        }
+
         private static Dto BuildDto()
         {
             var dto = new Dto

diff --git a/Refit/XmlContentSerializer.cs b/Refit/XmlContentSerializer.cs
@@ -26,12 +26,14 @@ public Task<HttpContent> SerializeAsync<T>(T item)
         {
             var xmlSerializer = new XmlSerializer(item.GetType(), settings.XmlAttributeOverrides);
 
-            using (var output = new StringWriter())
+            using (var stream = new MemoryStream())
             {
-                using (var writer = XmlWriter.Create(output, settings.XmlReaderWriterSettings.WriterSettings))
+                using (var writer = XmlWriter.Create(stream, settings.XmlReaderWriterSettings.WriterSettings))
                 {
+                    var encoding = settings.XmlReaderWriterSettings.WriterSettings?.Encoding ?? Encoding.Unicode;
                     xmlSerializer.Serialize(writer, item, settings.XmlNamespaces);
-                    var content = new StringContent(output.ToString(), Encoding.UTF8, "application/xml");
+                    var str = encoding.GetString(stream.ToArray());
+                    var content = new StringContent(str, encoding, "application/xml");
                     return Task.FromResult((HttpContent)content);
                 }
             }