Merge pull request #1016 from vidrenning/chunked

Do not use chunked transfer encoding on ASP.NET Core 2.1
DigDes · Feb 9, 2024 · 22ecb5c · 22ecb5c
2 parents 3ab2c90 + ff90b2b
commit 22ecb5c
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 62 deletions.
diff --git a/src/SoapCore.Tests/Wsdl/WsdlTests.cs b/src/SoapCore.Tests/Wsdl/WsdlTests.cs
@@ -1169,7 +1169,7 @@ private async Task<string> GetWsdlFromMetaBodyWriter<T>(SoapSerializer serialize
 
 			using (var memoryStream = new MemoryStream())
 			{
-				await encoder.WriteMessageAsync(responseMessage, memoryStream, true);
+				await encoder.WriteMessageAsync(responseMessage, null, memoryStream, true);
 				memoryStream.Position = 0;
 
 				using (var streamReader = new StreamReader(memoryStream))

diff --git a/src/SoapCore/CustomStringWriter.cs b/src/SoapCore/CustomStringWriter.cs
diff --git a/src/SoapCore/MessageEncoder/SoapMessageEncoder.cs b/src/SoapCore/MessageEncoder/SoapMessageEncoder.cs
@@ -181,41 +181,36 @@ public virtual async Task WriteMessageAsync(Message message, HttpContext httpCon
 
 			ThrowIfMismatchedMessageVersion(message);
 
-			//Custom string writer with custom encoding support
-			using (var stringWriter = new CustomStringWriter(_writeEncoding))
+			using var memoryStream = new MemoryStream();
+			using (var xmlTextWriter = XmlWriter.Create(memoryStream, new XmlWriterSettings
 			{
-				using (var xmlTextWriter = XmlWriter.Create(stringWriter, new XmlWriterSettings
-				{
-					OmitXmlDeclaration = _optimizeWriteForUtf8 && _omitXmlDeclaration, //can only omit if utf-8
-					Indent = indentXml,
-					Encoding = _writeEncoding,
-					CloseOutput = true,
-					CheckCharacters = _checkXmlCharacters
-				}))
-				{
-					using var xmlWriter = XmlDictionaryWriter.CreateDictionaryWriter(xmlTextWriter);
-					message.WriteMessage(xmlWriter);
-					xmlWriter.WriteEndDocument();
-					xmlWriter.Flush();
-				}
-
-				var data = stringWriter.ToString();
-				var soapMessage = _writeEncoding.GetBytes(data);
-
-				//Set Content-length in Response
-				httpContext.Response.ContentLength = soapMessage.Length;
+				OmitXmlDeclaration = _optimizeWriteForUtf8 && _omitXmlDeclaration, //can only omit if utf-8
+				Indent = indentXml,
+				Encoding = _writeEncoding,
+				CloseOutput = false,
+				CheckCharacters = _checkXmlCharacters
+			}))
+			{
+				using var xmlWriter = XmlDictionaryWriter.CreateDictionaryWriter(xmlTextWriter);
+				message.WriteMessage(xmlWriter);
+				xmlWriter.WriteEndDocument();
+				xmlWriter.Flush();
+			}
 
-				if (_overwriteResponseContentType)
-				{
-					httpContext.Response.ContentType = ContentType;
-				}
+			//Set Content-length in Response
+			httpContext.Response.ContentLength = memoryStream.Length;
 
-				await pipeWriter.WriteAsync(soapMessage);
-				await pipeWriter.FlushAsync();
+			if (_overwriteResponseContentType)
+			{
+				httpContext.Response.ContentType = ContentType;
 			}
+
+			memoryStream.Seek(0, SeekOrigin.Begin);
+			await memoryStream.CopyToAsync(pipeWriter);
+			await pipeWriter.FlushAsync();
 		}
 
-		public virtual Task WriteMessageAsync(Message message, Stream stream, bool indentXml)
+		public virtual async Task WriteMessageAsync(Message message, HttpContext httpContext, Stream stream, bool indentXml)
 		{
 			if (message == null)
 			{
@@ -229,21 +224,31 @@ public virtual Task WriteMessageAsync(Message message, Stream stream, bool inden
 
 			ThrowIfMismatchedMessageVersion(message);
 
-			using var xmlTextWriter = XmlWriter.Create(stream, new XmlWriterSettings
+			using var memoryStream = new MemoryStream();
+			using (var xmlTextWriter = XmlWriter.Create(memoryStream, new XmlWriterSettings
 			{
 				OmitXmlDeclaration = _optimizeWriteForUtf8 && _omitXmlDeclaration, //can only omit if utf-8,
 				Indent = indentXml,
 				Encoding = _writeEncoding,
 				CloseOutput = false,
 				CheckCharacters = _checkXmlCharacters
-			});
+			}))
+			{
+				using var xmlWriter = XmlDictionaryWriter.CreateDictionaryWriter(xmlTextWriter);
+				message.WriteMessage(xmlWriter);
+				xmlWriter.WriteEndDocument();
+				xmlWriter.Flush();
+			}
 
-			using var xmlWriter = XmlDictionaryWriter.CreateDictionaryWriter(xmlTextWriter);
-			message.WriteMessage(xmlWriter);
-			xmlWriter.WriteEndDocument();
-			xmlWriter.Flush();
+			if (httpContext != null) // HttpContext is null in unit tests
+			{
+				// Set Content-Length in response. This will disable chunked transfer-encoding.
+				httpContext.Response.ContentLength = memoryStream.Length;
+			}
 
-			return Task.CompletedTask;
+			memoryStream.Seek(0, SeekOrigin.Begin);
+			await memoryStream.CopyToAsync(stream);
+			await stream.FlushAsync();
 		}
 
 		internal static string GetMediaType(MessageVersion version)

diff --git a/src/SoapCore/SoapEndpointMiddleware.cs b/src/SoapCore/SoapEndpointMiddleware.cs
@@ -173,7 +173,7 @@ public async Task Invoke(HttpContext httpContext, IServiceProvider serviceProvid
 #if !NETCOREAPP3_0_OR_GREATER
 		private static Task WriteMessageAsync(SoapMessageEncoder messageEncoder, Message responseMessage, HttpContext httpContext, bool indentXml)
 		{
-			return messageEncoder.WriteMessageAsync(responseMessage, httpContext.Response.Body, indentXml);
+			return messageEncoder.WriteMessageAsync(responseMessage, httpContext, httpContext.Response.Body, indentXml);
 		}
 #else
 		private static Task WriteMessageAsync(SoapMessageEncoder messageEncoder, Message responseMessage, HttpContext httpContext, bool indentXml)
@@ -257,7 +257,7 @@ private async Task ProcessMeta(HttpContext httpContext, bool showDocumentation)
 				httpContext.Response.ContentType = "text/html;charset=UTF-8";
 
 				using var ms = new MemoryStream();
-				await messageEncoder.WriteMessageAsync(responseMessage, ms, _options.IndentWsdl);
+				await messageEncoder.WriteMessageAsync(responseMessage, httpContext, ms, _options.IndentWsdl);
 				ms.Position = 0;
 				using var sr = new StreamReader(ms);
 				var wsdl = await sr.ReadToEndAsync();