Skip to content

Fix XSD schemaLocation when UrlOverride is specified #1177

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

Open
zgabi wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fix XSD schemaLocation when UrlOverride is specified #1177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f36ea53
Fix XSD schemaLocation when UrlOverride is specified
Jan 17, 2026
6217885
test fix
Jan 17, 2026
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
2 changes: 1 addition & 1 deletion src/SoapCore.Tests/WsdlFromFile/WsdlIncludeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public void CheckXSDIncludeXSD()
var addresses = _host.ServerFeatures.Get<IServerAddressesFeature>();
var address = addresses.Addresses.Single();

string url = address + "/Service.asmx?xsd&name=echoIncluded.xsd";
string url = address + "/Management/Service.asmx?xsd&name=echoIncluded.xsd";

Assert.IsNotNull(element);
Assert.AreEqual(url, element.Attributes["schemaLocation"]?.Value);
Expand Down
3 changes: 1 addition & 2 deletions src/SoapCore/HeadersHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,7 @@ public static string GetSoapAction(HttpContext httpContext, ref Message message)
}
#endif

if (soapAction != null &&
(GetTrimmedSoapAction(soapAction).Length == 0 || GetTrimmedClearedSoapAction(soapAction).Length == 0))
if (GetTrimmedSoapAction(soapAction).Length == 0 || GetTrimmedClearedSoapAction(soapAction).Length == 0)
{
soapAction = ReadOnlySpan<char>.Empty;
}
Expand Down
16 changes: 4 additions & 12 deletions src/SoapCore/SoapEndpointMiddleware.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1060,9 +1060,9 @@ private MetaFromFile GetMeta(HttpContext httpContext)
meta.CurrentWebServer = options.VirtualPath + "/";
}

meta.CurrentWebService = httpContext.Request.Path.Value.Replace("/", string.Empty);
var mapping = options.WebServiceWSDLMapping[meta.CurrentWebService];

string url = httpContext.Request.Path.Value.Replace("/", string.Empty);
var mapping = options.WebServiceWSDLMapping[url];
meta.CurrentWebService = string.IsNullOrEmpty(mapping.UrlOverride) ? url : mapping.UrlOverride;
meta.WSDLFolder = mapping.WSDLFolder;
meta.XsdFolder = mapping.SchemaFolder;
meta.ServerUrl = GetServerUrl(options, httpContext);
Expand Down Expand Up @@ -1135,15 +1135,7 @@ private async Task ProcessMetaFromFile(HttpContext httpContext, bool showDocumen
meta.CurrentWebServer = options.VirtualPath + "/";
}

if (string.IsNullOrEmpty(mapping.UrlOverride))
{
meta.CurrentWebService = url;
}
else
{
meta.CurrentWebService = mapping.UrlOverride;
}

meta.CurrentWebService = string.IsNullOrEmpty(mapping.UrlOverride) ? url : mapping.UrlOverride;
meta.WSDLFolder = mapping.WSDLFolder;
meta.XsdFolder = mapping.SchemaFolder;
meta.ServerUrl = GetServerUrl(options, httpContext);
Expand Down
Loading