Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

removed unnessecary buffered copy #1029

Merged
merged 4 commits into from
Feb 29, 2024
Merged

removed unnessecary buffered copy #1029

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2bff13b
removed unnessecary buffered copy
Feb 29, 2024
fbec6cb
use null-xmlresolver
Feb 29, 2024
bbbd0d0
merge develop
Feb 29, 2024
7cd18b5
v1.1.0.46
Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/SoapCore/DocumentationWriter/SoapMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,15 @@ public static SoapDefinition DeserializeFromString(string xml)
return (SoapDefinition)xs.Deserialize(sr);
}

public static SoapDefinition DeserializeFromStream(Stream xml)
{
XmlSerializer xs = new XmlSerializer(typeof(SoapDefinition));

xs.UnknownElement += _unknownElementHandler;

return (SoapDefinition)xs.Deserialize(xml);
}

public string GenerateDocumentation()
{
#if NETCOREAPP3_1_OR_GREATER
Expand Down
46 changes: 22 additions & 24 deletions src/SoapCore/MessageEncoder/SoapMessageEncoder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,35 +139,33 @@

Message message;

using (var ms = new MemoryStream())
{
await stream.CopyToAsync(ms);
ms.Seek(0, SeekOrigin.Begin);
XmlReader reader;
var ms = new MemoryStream();
await stream.CopyToAsync(ms);
ms.Seek(0, SeekOrigin.Begin);
XmlReader reader;

var readEncoding = SoapMessageEncoderDefaults.ContentTypeToEncoding(contentType);
var readEncoding = SoapMessageEncoderDefaults.ContentTypeToEncoding(contentType);

if (readEncoding == null)
{
// Fallback to default or writeEncoding
readEncoding = _writeEncoding;
}
if (readEncoding == null)
{
// Fallback to default or writeEncoding
readEncoding = _writeEncoding;
}

var supportXmlDictionaryReader = SoapMessageEncoderDefaults.TryValidateEncoding(readEncoding, out _);
var supportXmlDictionaryReader = SoapMessageEncoderDefaults.TryValidateEncoding(readEncoding, out _);

if (supportXmlDictionaryReader)
{
reader = XmlDictionaryReader.CreateTextReader(ms, readEncoding, ReaderQuotas, dictionaryReader => { });
}
else
{
var streamReaderWithEncoding = new StreamReader(ms, readEncoding);
var xmlReaderSettings = new XmlReaderSettings() { IgnoreWhitespace = true, DtdProcessing = DtdProcessing.Prohibit, CloseInput = true };
reader = XmlReader.Create(streamReaderWithEncoding, xmlReaderSettings);
}

message = Message.CreateMessage(reader, maxSizeOfHeaders, MessageVersion).CreateBufferedCopy(int.MaxValue).CreateMessage();
if (supportXmlDictionaryReader)
{
reader = XmlDictionaryReader.CreateTextReader(ms, readEncoding, ReaderQuotas, dictionaryReader => { });
}
else
{
var streamReaderWithEncoding = new StreamReader(ms, readEncoding);
var xmlReaderSettings = new XmlReaderSettings() { IgnoreWhitespace = true, DtdProcessing = DtdProcessing.Prohibit, CloseInput = true };
reader = XmlReader.Create(streamReaderWithEncoding, xmlReaderSettings);
Fixed Show fixed Hide fixed
}

message = Message.CreateMessage(reader, maxSizeOfHeaders, MessageVersion);

return message;
}
Expand Down
10 changes: 2 additions & 8 deletions src/SoapCore/Meta/BodyWriterExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,8 @@ public static bool TryAddSchemaTypeFromXmlSchemaProviderAttribute(this XmlDictio

memoryStream.Position = 0;

var streamReader = new StreamReader(memoryStream);
var result = streamReader.ReadToEnd();

var doc = new XmlDocument();
doc.LoadXml(result);
doc.Load(memoryStream);
doc.DocumentElement.WriteContentTo(writer);

return true;
Expand Down Expand Up @@ -130,11 +127,8 @@ public static bool TryAddSchemaTypeFromXmlSchemaProviderAttribute(this XmlDictio
schema.Write(memoryStream);
memoryStream.Position = 0;

var streamReader = new StreamReader(memoryStream);
var result = streamReader.ReadToEnd();

var doc = new XmlDocument();
doc.LoadXml(result);
doc.Load(memoryStream);
doc.DocumentElement.WriteContentTo(writer);

return true;
Expand Down
7 changes: 2 additions & 5 deletions src/SoapCore/SoapEndpointMiddleware.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,10 +264,7 @@ private async Task ProcessMeta(HttpContext httpContext, bool showDocumentation)
using var ms = new MemoryStream();
await messageEncoder.WriteMessageAsync(responseMessage, httpContext, ms, _options.IndentWsdl);
ms.Position = 0;
using var sr = new StreamReader(ms);
var wsdl = await sr.ReadToEndAsync();

var documentation = SoapDefinition.DeserializeFromString(wsdl).GenerateDocumentation();
var documentation = SoapDefinition.DeserializeFromStream(ms).GenerateDocumentation();

await httpContext.Response.WriteAsync(documentation);

Expand Down Expand Up @@ -438,7 +435,7 @@ bool TryGetRequestValue(string key, out StringValues value)

bodyWriter.WriteBodyContents(dictionaryWriter);
dictionaryWriter.Flush();
await context.Response.WriteAsync(DefaultEncodings.UTF8.GetString(ms.ToArray()));
await ms.CopyToAsync(context.Response.Body);
}

private Func<Message, Task<Message>> MakeProcessorPipe(ISoapMessageProcessor[] soapMessageProcessors, HttpContext httpContext, Func<Message, Task<Message>> processMessageFunc)
Expand Down
Loading